2
0
Commit Graph

1088 Commits

Author SHA1 Message Date
Unknwon
970e514f4e #2650 fix possbility that use email as pusher user name
Remove the possibility of using email as user name when user actually push
through combination of email and password with HTTP.

Also refactor update action function to replcae tons of arguments with
single PushUpdateOptions struct.
And define the user who pushes code as pusher, therefore variable names shouldn't
be confusing any more.
2016-02-17 22:47:06 -05:00
Lunny Xiao
b7b5961279 fix dependency broken because xorm's API changed 2016-02-16 22:35:08 +08:00
Unknwon
bfc85fc0a9 #2630 fix wrong user avatar link in webhook
Was using the wrong method and now uses the method which checks if
the avatar link is relative or not.
2016-02-15 15:18:53 -05:00
Unknwon
871ceac7de Minor fix for #2624 2016-02-15 14:57:15 -05:00
Unknwon
4d6f101c32 Merge pull request #2624 from mhartkorn/convert-mirror-to-repo
Convert mirrors to regular repositories
2016-02-15 14:26:21 -05:00
Martin Hartkorn
3887dda67e Moved UpdateRepository() to CleanUpMigrateInfo() and correctly delete mirror from database 2016-02-15 14:59:24 +01:00
Unknwon
354dd25700 Remove cache avatar support and add its tests 2016-02-14 23:14:55 -05:00
Unknwon
3947b4aedc Minor fix for #2578 2016-02-14 20:36:03 -05:00
Unknwon
b1e75c8f86 Merge pull request #2578 from exmex/develop
Admins and user itself sees private org relations on profile
2016-02-14 20:34:53 -05:00
Unknwon
8f32600b46 Minor fix for #2567 2016-02-14 20:07:42 -05:00
Unknwon
e5c5576f76 Merge pull request #2567 from fnkr/hide-other-teams-activity-from-dashboard
Only show activities and repositories on the dashboard, that the user has access to
2016-02-14 19:57:49 -05:00
Unknwon
55ddb90e64 #2569 delete repo local copy when transfer
Remote repository path is renamed but does not delete
outdated local copy which still has old repository path
as remote.
2016-02-14 19:42:38 -05:00
Martin Hartkorn
71c5f9133e Refactored according to suggestions 2016-02-14 22:40:39 +01:00
Martin Hartkorn
e31b92a896 Convert mirrors to regular repositories. 2016-02-14 21:12:00 +01:00
Josh Frye
4b87e480bf Add default branch to repo payload 2016-02-12 11:04:46 -05:00
Josh Frye
4b703b92f7 Remove local wiki copy on repo transfer. Fixes #2558 2016-02-11 19:26:51 -05:00
Unknwon
025ba7ff65 #1577 fix missing SQL query placeholder 2016-02-10 17:30:24 -05:00
Unknwon
aee228d07e #2485 fix payloads mixed up for webhook
When repository contains a Slack type hook,
it changes original payload content.

This patch fixes it by using a local object to store
newly created Slack payload instead of assigning
back to the same variable.
2016-02-10 15:21:39 -05:00
Unknwon
8706ef1cc6 Merge pull request #2528 from andreynering/diff-sintax-highlight-733
Enable syntax highlighting on diff view
2016-02-07 11:49:11 -05:00
Andrey Nering
00cb022eb9 Workaroud delete folder on Windows. Fix #1738 2016-02-07 13:39:32 -02:00
ExMex
239887e383 Admins and user itself sees private org relations on profile 2016-02-07 10:20:58 +01:00
Florian Kaiser
6cc1ebfb8b Only show activities for repositories on dashboard, that the user has access to 2016-02-06 07:52:21 +00:00
Tobias Kunicke
b4600c27b5 regulate timezone for milestone.deadline 2016-02-06 00:08:02 +01:00
Unknwon
5152b27bf8 #2558 delete local wiki copy when rename repo and user 2016-02-05 14:11:53 -05:00
Andrey Nering
594c929461 Enable sintax highlighting on diff view. Close #733 2016-02-04 18:21:47 -02:00
Andrey Nering
b7bced81ee go fmt models/git_diff_test.go 2016-02-04 17:55:17 -02:00
Unknwon
a49a7a6b9b Minor fix for #2530 2016-02-04 13:03:34 -05:00
Unknwon
c29b0b3252 Merge pull request #2530 from fnkr/hide-other-teams-repos-from-org-page
Hide other teams & repos from organization page
2016-02-04 12:52:11 -05:00
Unknwon
7ba66bb20b #2554 reinitialize all repos from the db
- Update locales
2016-02-04 12:51:00 -05:00
Florian Kaiser
95d267ab79 Remove unnecessary private functions 2016-02-04 17:08:25 +00:00
Unknwon
124de71845 Add missing patch conflit pattern 2016-02-03 12:28:03 -05:00
Unknwon
99accec8fd Minor fix for #2506 2016-02-02 17:07:40 -05:00
Unknwon
3b74858f77 Merge pull request #2506 from sapk/add-branche-api-support
Implement API for branches listing
2016-02-02 16:51:14 -05:00
Unknwon
38cb0cb23f Fix random avatar does not work on Windows
path.Dir can't handle Windows case, must use filepath.Dir
2016-02-02 10:22:27 -05:00
Unknwon
d74dd53ead Merge pull request #2540 from JohnMaguire/bugfix/2447-delete-public-key-authorized_keys
Fixes #2447 (delete public key from authorized_keys)
2016-02-01 16:32:30 -05:00
John Maguire
f92febb054 Trim whitespace when adding SSH keys (fixes #2447) 2016-01-31 22:02:36 -05:00
John Maguire
d3db1a846d Add debug log when SSH key for deletion isn't found 2016-01-31 22:02:23 -05:00
Florian Kaiser
ea3cdf63d7 Use invalid value (-1) instead of 0 to prevent bug if auto increment starts with 0 2016-01-31 19:17:58 +00:00
Florian Kaiser
9b61a9bbf3 Everyone can see public repos 2016-01-31 18:37:50 +00:00
Florian Kaiser
df81362363 Only show teams the user has access to 2016-01-31 15:30:07 +00:00
Florian Kaiser
9bcee7bb14 Only show repositories the user has access to, on the organization home 2016-01-31 15:29:45 +00:00
Florian Kaiser
0a84826146 Show all orgs on user profile, except the private one's 2016-01-30 21:53:58 +00:00
Unknwon
ce7051e2ae #2497 incorrect error handle for team name 2016-01-29 17:06:14 -05:00
Antoine GIRARD
70aadc35aa Corrections following recommendations 2016-01-28 20:51:19 +01:00
Antoine GIRARD
56e11cdc81 Near ready 2016-01-28 20:51:19 +01:00
Unknwon
70d0e30801 Record error when fail to health check repository 2016-01-28 06:46:25 -05:00
Unknwon
a0b1c6ab2b Minor fix for #2494
- Change tooltip size from mini to tiny in profile page
2016-01-28 06:07:16 -05:00
Unknwon
8d0a8c290e Merge pull request #2494 from mhartkorn/pullreq-name-change
Change user name in Pull Requests to avoid errors (fixes #2495)
2016-01-28 05:58:37 -05:00
Martin Hartkorn
01031ba457 Change user name in Pull Requests 2016-01-27 22:45:03 +01:00
Andrey Nering
ddcce651a6 Refactoring of inline diff computing to prevent empty diff box. Fix #2489 2016-01-27 18:54:08 -02:00