summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mr-widget-text' into 'master' 8-0-developmentDmitriy Zaporozhets2015-08-1018-98/+119
|\
| * More textual tweaksmr-widget-textDouwe Maan2015-08-093-5/+6
| * Merge branch 'master' into mr-widget-textDouwe Maan2015-08-0911-22/+52
| |\
| * | Make modal narrowerDouwe Maan2015-08-091-0/+4
| * | Tweak MR widget text some more.Douwe Maan2015-08-083-3/+5
| * | Improve text in MR "How To Merge" modal.Douwe Maan2015-08-082-26/+30
| * | Improve MR merge widget text and UI consistency.Douwe Maan2015-08-0816-69/+79
* | | Merge branch 'trigger-hooks' into 'master' Dmitriy Zaporozhets2015-08-102-3/+66
|\ \ \
| * | | Refactor Trigger post-receive hooks after commits are made by GitLabDmitriy Zaporozhets2015-08-101-11/+11
| * | | Trigger post-receive hoooks when commits are made by GitLabtrigger-hooksDmitriy Zaporozhets2015-08-102-2/+65
* | | | Merge branch 'fix-event-cache' into 'master' Dmitriy Zaporozhets2015-08-101-1/+1
|\ \ \ \
| * | | | Fix event cachefix-event-cacheDouwe Maan2015-08-101-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'dropzone-upload-progress' into 'master'Stan Hu2015-08-103-3/+19
|\ \ \ \ | |_|/ / |/| | |
| * | | Add dropzone upload progressNikita Verkhovin2015-08-103-3/+19
* | | | Merge branch 'rs-reference-data-attrs' into 'master' Robert Speicher2015-08-1015-8/+96
|\ \ \ \
| * | | | Add `data-[type]-id` attribute to reference linksrs-reference-data-attrsRobert Speicher2015-08-0815-8/+96
* | | | | Merge branch 'gravatar-host-link' into 'master'Stan Hu2015-08-095-2/+19
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | ink to configured gravatar host on profile pageBen Bodenmiller2015-08-055-2/+19
* | | | | 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
| |\ \ \ \ \ \ \
View Lorry Controller Status