summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Trigger post-receive hoooks when commits are made by GitLabtrigger-hooksDmitriy Zaporozhets2015-08-102-2/+65
* Merge branch 'gravatar-host-link' into 'master'Stan Hu2015-08-091-2/+2
|\
| * ink to configured gravatar host on profile pageBen Bodenmiller2015-08-051-2/+2
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-093-7/+11
|\ \
| * \ Merge branch 'ui-improvements' into 'master' Dmitriy Zaporozhets2015-08-093-7/+11
| |\ \
| | * | Revert "Put author name at the end of a tree row"Dmitriy Zaporozhets2015-08-072-5/+6
| | * | Add more spacing between MR widget and tabsDmitriy Zaporozhets2015-08-071-2/+5
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-08-097-54/+48
|\ \ \ \ | |/ / /
| * | | Merge branch 'rs-fix-msapplication-tileimage' into 'master' Robert Speicher2015-08-091-0/+0
| |\ \ \
| | * | | Fix transparency for msapplication-tile imageRobert Speicher2015-08-081-0/+0
| * | | | Merge branch 'cache-events' into 'master' Robert Speicher2015-08-095-14/+39
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Use display: inline where appropriatecache-eventsDouwe Maan2015-08-062-1/+9
| | * | | Cache all eventsDouwe Maan2015-08-065-14/+31
| * | | | Merge branch 'merge-notifs' into 'master'Robert Speicher2015-08-071-40/+9
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Merge branch 'master' into merge-notifsmerge-notifsDouwe Maan2015-08-0667-326/+481
| | |\ \ \ | | | |/ /
| | * | | Send notification to all participants when MR is merged.Douwe Maan2015-07-301-40/+9
* | | | | Improve abuse report wordingStefan Tatschner2015-08-081-1/+1
|/ / / /
* | | | Merge branch 'bitbucket-show-incompatible' into 'master'Douwe Maan2015-08-072-5/+29
|\ \ \ \
| * | | | Show incompatible projects in Bitbucket import statusStan Hu2015-08-072-5/+29
* | | | | Merge branch 'improve-merge-requests' into 'master' Dmitriy Zaporozhets2015-08-0711-160/+113
|\ \ \ \ \
| * | | | | Move command line insturction out of mr widgetDmitriy Zaporozhets2015-08-074-46/+30
| * | | | | Refactor merge request widgetDmitriy Zaporozhets2015-08-077-117/+86
| * | | | | Link mr commits/diffs to target projectDmitriy Zaporozhets2015-08-072-2/+2
| * | | | | Create ref for every merge request. Add documentation for fetch merge requestsDmitriy Zaporozhets2015-08-071-2/+2
| * | | | | Fetch to mr code from fork to iidDmitriy Zaporozhets2015-08-071-1/+1
* | | | | | Merge branch 'comment-updated-by' into 'master' Douwe Maan2015-08-0712-58/+35
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into comment-updated-bycomment-updated-byDouwe Maan2015-08-0716-11/+154
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge branch 'master' into comment-updated-byDouwe Maan2015-08-0666-322/+472
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'master' into comment-updated-byDouwe Maan2015-07-316-14/+22
| |\ \ \ \ \ \
| * | | | | | | Reset correct event cacheDouwe Maan2015-07-311-1/+1
| * | | | | | | Show who last edited a comment if it wasn't the original authorDouwe Maan2015-07-3012-58/+35
* | | | | | | | Merge branch 'rs-group-convenience-methods' into 'master' Douwe Maan2015-08-071-1/+17
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add `Group#add_*` convenience methodsrs-group-convenience-methodsRobert Speicher2015-08-071-1/+17
* | | | | | | | Merge branch 'explore-markdown' into 'master'Dmitriy Zaporozhets2015-08-071-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Apply markdown filter for project descriptions on explore viewSven Strickroth2015-08-051-2/+2
* | | | | | | | Merge branch 'issue-2216' into 'master'Stan Hu2015-08-071-7/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Diff colors on MR Discussion like on Changes-tabGert Goet2015-08-061-7/+8
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'nicer-merge-conflicts-widget' into 'master' Dmitriy Zaporozhets2015-08-061-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Split merge conflict messages on 2 linesnicer-merge-conflicts-widgetDmitriy Zaporozhets2015-08-061-1/+2
| |/ / / / / /
* | | | | | | Merge branch 'add-current-user-to-autocomplete' into 'master'Dmitriy Zaporozhets2015-08-061-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Always add current user to autocomplete controller to support filter by "Me"Stan Hu2015-08-061-0/+2
* | | | | | | | Merge branch 'fix-namespace-move-dir' into 'master' Dmitriy Zaporozhets2015-08-061-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Ensure old namespace directory exists before moving itfix-namespace-move-dirDmitriy Zaporozhets2015-08-061-0/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'report-spam'Dmitriy Zaporozhets2015-08-068-0/+125
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve wording in abuse report formDmitriy Zaporozhets2015-08-062-5/+4
| * | | | | | | | Remove selectbox from abuse form. Added pagination in admin areaDmitriy Zaporozhets2015-08-062-5/+3
| * | | | | | | | Add abuse report management in admin areaDmitriy Zaporozhets2015-08-064-0/+57
| * | | | | | | | Allow users to send abuse reportsDmitriy Zaporozhets2015-08-064-0/+71
| |/ / / / / / /
* | | | | | | | Add project name to project headDouwe Maan2015-08-063-1/+12
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'remove-email-from-published-keys' into 'master'Douwe Maan2015-08-062-1/+6
|\ \ \ \ \ \ \