summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix event cachefix-event-cacheDouwe Maan2015-08-101-1/+1
* 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-0911-66/+85
|\ \ \ | |/ /
| * | 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-096-14/+40
| |\ \ \ | | |/ / | |/| |
| | * | Use display: inline where appropriatecache-eventsDouwe Maan2015-08-062-1/+9
| | * | Cache all eventsDouwe Maan2015-08-066-14/+32
| * | | Merge branch 'merge-notifs' into 'master'Robert Speicher2015-08-074-52/+44
| |\ \ \
| | * \ \ Merge branch 'master' into merge-notifsmerge-notifsDouwe Maan2015-08-06159-1591/+1715
| | |\ \ \ | | | |/ /
| | * | | Update notification docsDouwe Maan2015-08-061-11/+28
| | * | | Send notification to all participants when MR is merged.Douwe Maan2015-07-303-41/+16
| * | | | Do a git checkout on Gemfile.lock and schema.rb prior to update. Fixes #2227Achilleas Pipinellis2015-08-071-0/+1
* | | | | Merge pull request #9543 from rumpelsepp/englishStan Hu2015-08-091-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Improve abuse report wordingStefan Tatschner2015-08-081-1/+1
|/ / / /
* | | | Merge branch 'fix-changelog-versions' into 'master'Stan Hu2015-08-071-5/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix entries to belong in the right versionStan Hu2015-08-071-5/+3
|/ / /
* | | Merge branch 'bitbucket-show-incompatible' into 'master'Douwe Maan2015-08-075-6/+37
|\ \ \
| * | | Show incompatible projects in Bitbucket import statusStan Hu2015-08-075-6/+37
* | | | Merge branch 'improve-merge-requests' into 'master' Dmitriy Zaporozhets2015-08-0713-160/+154
|\ \ \ \
| * | | | Move command line insturction out of mr widgetDmitriy Zaporozhets2015-08-074-46/+30
| * | | | Refactor merge request widgetDmitriy Zaporozhets2015-08-077-117/+86
| * | | | Link merge request doc to READMEimprove-merge-requestsDmitriy Zaporozhets2015-08-072-1/+1
| * | | | 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-072-2/+43
| * | | | Fetch to mr code from fork to iidDmitriy Zaporozhets2015-08-071-1/+1
* | | | | Merge branch 'comment-updated-by' into 'master' Douwe Maan2015-08-0716-66/+52
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into comment-updated-bycomment-updated-byDouwe Maan2015-08-0731-17/+293
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge branch 'master' into comment-updated-byDouwe Maan2015-08-06149-1254/+1247
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into comment-updated-byDouwe Maan2015-07-3126-362/+512
| |\ \ \ \ \
| * | | | | | Reset correct event cacheDouwe Maan2015-07-311-1/+1
| * | | | | | Show who last edited a comment if it wasn't the original authorDouwe Maan2015-07-3016-67/+53
* | | | | | | Merge branch 'rs-group-convenience-methods' into 'master' Douwe Maan2015-08-0711-14/+30
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add `Group#add_*` convenience methodsrs-group-convenience-methodsRobert Speicher2015-08-0711-14/+30
* | | | | | | Merge branch 'bump_gitlab_shell' into 'master' Dmitriy Zaporozhets2015-08-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | gitlab-shell bump to 2.6.4bump_gitlab_shellValery Sizov2015-08-051-1/+1
* | | | | | | | 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-072-7/+9
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add fix #2216 in CHANGELOG [ci skip]Gert Goet2015-08-061-0/+1
| * | | | | | | 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-064-2/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | Always add current user to autocomplete controller to support filter by "Me"Stan Hu2015-08-064-2/+28
* | | | | | | | | 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
| | |_|/ / / / / / | |/| | | | | | |
View Lorry Controller Status