summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use gitlab-workhorse 0.5.1gitlab-workhorse-0.5.1Jacob Vosmaer2015-12-173-3/+3
* Merge branch 'fix-migration' into 'master' Kamil Trzciński2015-12-171-1/+2
|\
| * Fix ci_projects migration by using the value only from latest row [ci skip]Kamil Trzcinski2015-12-171-1/+2
* | Merge branch 'revert-sidebar' into 'master' Dmitriy Zaporozhets2015-12-178-108/+93
|\ \ | |/ |/|
| * Revert sidebar position for issue and merge requestDmitriy Zaporozhets2015-12-178-108/+93
|/
* Merge branch 'ux/closed-message' into 'master' Dmitriy Zaporozhets2015-12-174-9/+4
|\
| * Fix ux issue with "This issue will be closed automatically" messageux/closed-messageDmitriy Zaporozhets2015-12-174-9/+4
* | Merge branch 'doc_private_registry' into 'master' Achilleas Pipinellis2015-12-171-2/+21
|\ \ | |/ |/|
| * Add info on using private Docker registries in CI [ci skip]Achilleas Pipinellis2015-12-171-2/+21
* | Merge branch 'api-support-starred-projects' into 'master' Dmitriy Zaporozhets2015-12-164-1/+47
|\ \
| * | Api support for requesting starred projects for userZeger-Jan van de Weg2015-12-164-1/+47
* | | Merge branch 'move-mr-builds-tab' into 'master' Dmitriy Zaporozhets2015-12-162-11/+11
|\ \ \
| * | | Move MR Builds tab next to CommitsDouwe Maan2015-12-162-11/+11
| |/ /
* | | Merge branch 'fix-merge-immediately-button' into 'master' Robert Speicher2015-12-162-16/+14
|\ \ \
| * | | Fix merge widget JS for buttonsfix-merge-immediately-buttonDouwe Maan2015-12-161-10/+8
| * | | Merge branch 'master' into fix-merge-immediately-buttonDouwe Maan2015-12-166-56/+33
| |\ \ \
| * | | | Fix updating and disabling merge button when Merge Immediately is clickedDouwe Maan2015-12-162-7/+7
* | | | | Merge branch 'fix_rubocop' into 'master' Robert Speicher2015-12-161-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix Rubocop complain.fix_rubocopRubén Dávila2015-12-161-1/+1
* | | | | Merge branch 'yaml-ci-cleanup' into 'master' Achilleas Pipinellis2015-12-161-133/+212
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Clean up ci yaml doc [ci skip]yaml-ci-cleanupAchilleas Pipinellis2015-12-161-133/+212
| |/ / /
* | | | Merge branch 'feature/remove-celluloid' into 'master' Dmitriy Zaporozhets2015-12-162-26/+5
|\ \ \ \
| * | | | Update rerun to remove celluloid as dependencyfeature/remove-celluloidGabriel Mazetto2015-12-132-26/+5
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-162-5/+7
|\ \ \ \ \
| * \ \ \ \ Merge branch 'mr-builds-fixes' into 'master' Dmitriy Zaporozhets2015-12-161-4/+4
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Link to correct (source) project on MR builds tabmr-builds-fixesDouwe Maan2015-12-161-4/+4
| * | | | | Merge branch 'disable-markdown-cache' into 'master' Douwe Maan2015-12-161-1/+3
| |\ \ \ \ \
| | * | | | | Temporarily disable Markdown cachingDouwe Maan2015-12-161-1/+3
| | |/ / / /
* | | | | | Merge remote-tracking branch 'origin/rs-simplify-status-icon'Dmitriy Zaporozhets2015-12-163-26/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Define CI status icon colors in SCSS instead of a helperrs-simplify-status-iconRobert Speicher2015-12-123-26/+24
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-milestone-snippet-header' into 'master' Dmitriy Zaporozhets2015-12-1623-182/+186
|\ \ \ \ \
| * | | | | Fix specfix-milestone-snippet-headerDouwe Maan2015-12-161-1/+1
| * | | | | Rename .issuable-details to .detail-page (and -header and -description)Douwe Maan2015-12-1622-188/+188
| * | | | | Merge branch 'master' into fix-milestone-snippet-headerDouwe Maan2015-12-16168-1002/+1005
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Fix testsDouwe Maan2015-12-161-1/+1
| * | | | | Move milestone edit button to the very rightDouwe Maan2015-12-151-4/+4
| * | | | | Fix headers of milestone and snippet show pagesDouwe Maan2015-12-154-12/+16
* | | | | | Merge branch 'reference-cache' into 'master' Robert Speicher2015-12-161-1/+1
|\ \ \ \ \ \
| * | | | | | Only cache markdown when object has been saved and has a proper cache_key.Douwe Maan2015-12-161-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix-merge-immediately' into 'master' Robert Speicher2015-12-161-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix 'Merge Immediately' buttonfix-merge-immediatelyDouwe Maan2015-12-161-1/+1
| |/ / / /
* | | | | Merge branch 'fix-bad-merge' into 'master' Douwe Maan2015-12-161-1/+0
|\ \ \ \ \
| * | | | | Fix bad mergeStan Hu2015-12-161-1/+0
* | | | | | Merge branch 'fix-endpoint-not-setting-var' into 'master' Douwe Maan2015-12-161-6/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix endpoint not setting needed @ci_commitZeger-Jan van de Weg2015-12-161-6/+3
* | | | | | Merge branch 'control-list-right-margin' into 'master' Dmitriy Zaporozhets2015-12-161-1/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix right margin of control listDouwe Maan2015-12-161-1/+5
| | |/ / / | |/| | |
* | | | | Merge branch 'issuable-sidebar' into 'master' Dmitriy Zaporozhets2015-12-161-8/+8
|\ \ \ \ \
| * | | | | Revert "Fix "Notifications" label color"Douwe Maan2015-12-161-1/+1
| * | | | | Revert "Use regularly colored button for "Subscribe"/"Unsubscribe""Douwe Maan2015-12-161-1/+1