summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Explicitly require Nokogiri 1.6.7.1 due to security issuers-bump-nokogiriRobert Speicher2015-12-182-1/+5
* Merge branch 'update-rack-attack-security' into 'master' Robert Speicher2015-12-183-3/+4
|\
| * Bump Rack Attack to v4.3.1 for security fixStan Hu2015-12-183-3/+4
|/
* Merge branch 'remove-extra-spaces' into 'master' Robert Speicher2015-12-181-8/+4
|\
| * Remove extra spaces after branchnameZeger-Jan van de Weg2015-12-181-8/+4
* | Merge branch 'fix/mr-reopen-button-title' into 'master' Grzegorz Bizon2015-12-181-3/+3
|\ \
| * | Fix merge-request-reopen button titlefix/mr-reopen-button-titleGrzegorz Bizon2015-12-181-3/+3
* | | Merge branch 'create_menu_additions' into 'master' Dmitriy Zaporozhets2015-12-181-2/+10
|\ \ \
| * | | Add branch and tag operation to tree dropdownDrew Blessing2015-12-171-2/+10
* | | | Merge branch 'remove-duplicate-changelog-entry' into 'master' Douwe Maan2015-12-181-1/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove duplicate entry in the changelogZeger-Jan van de Weg2015-12-181-1/+0
| | |/ | |/|
* | | Merge branch 'gitlab-shell-2.6.9' into 'master' Robert Speicher2015-12-172-2/+2
|\ \ \ | |_|/ |/| |
| * | Use gitlab-shell 2.6.9gitlab-shell-2.6.9Jacob Vosmaer2015-12-172-2/+2
|/ /
* | Merge branch 'gitlab-workhorse-0.5.1' into 'master' Robert Speicher2015-12-173-3/+3
|\ \
| * | Use gitlab-workhorse 0.5.1gitlab-workhorse-0.5.1Jacob Vosmaer2015-12-173-3/+3
* | | Merge branch 'issue_4131' into 'master' Robert Speicher2015-12-174-8/+9
|\ \ \ | |/ / |/| |
| * | Upgrade Poltergeist to 1.8.1. #4131issue_4131Rubén Dávila2015-12-174-8/+9
* | | 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
| |\ \ \ \ \ | | | |/ / / | | |/| | |
View Lorry Controller Status