summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'update_artifact_runner_docs' into 'master' Achilleas Pipinellis2015-12-191-1/+2
|\ | | | | | | | | | | | | Clarify Windows shell executor artifact upload support @ayufan noted that the runner does not support artifact upload for Windows shell executor. This adds a note so users aren't confused. See merge request !2142
| * Clarify Windows shell executor artifact upload supportDrew Blessing2015-12-171-1/+2
| |
* | Merge branch 'ci-commit-status-skipped' into 'master' Grzegorz Bizon2015-12-187-43/+36
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled Fixes #3827 Fixes #4157 /cc @grzesiek @dblessing See merge request !2139
| * | Fix feature specs: we always show the build status if ci_commit is presentci-commit-status-skippedKamil Trzcinski2015-12-171-23/+6
| | |
| * | Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if ↵Kamil Trzcinski2015-12-176-20/+30
| |/ | | | | | | the builds are enabled
* | Merge branch 'reference_clean_up' into 'master' Robert Speicher2015-12-181-3/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not display project group/name when issue and MR are in same project I noticed that things seem a bit cluttered for related merge requests when displaying the group/project name for every item, even when it's in the same project. For merge requests that are in the same project as the issue we probably don't need to display the 'in group / name' bit. See merge request !2141
| * | Do not display project group/name when issue and MR are in same projectDrew Blessing2015-12-171-3/+4
| | |
* | | Merge branch 'update-rack-attack-security' into 'master' Robert Speicher2015-12-183-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Bump Rack Attack to v4.3.1 for security fix https://github.com/kickstarter/rack-attack/releases/tag/v4.3.1 See merge request !2153
| * | | Bump Rack Attack to v4.3.1 for security fixStan Hu2015-12-183-3/+4
|/ / / | | | | | | | | | https://github.com/kickstarter/rack-attack/releases/tag/v4.3.1
* | | Merge branch 'remove-extra-spaces' into 'master' Robert Speicher2015-12-181-8/+4
|\ \ \ | | | | | | | | | | | | | | | | Remove extra spaces after branchname See merge request !2152
| * | | 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 title Closes #4069 See merge request !2147
| * | | | Fix merge-request-reopen button titlefix/mr-reopen-button-titleGrzegorz Bizon2015-12-181-3/+3
| | | | | | | | | | | | | | | | | | | | Closes #4069
* | | | | Merge branch 'create_menu_additions' into 'master' Dmitriy Zaporozhets2015-12-181-2/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new branch and tag action to tree dropdown Right now, creating a branch or tag is only possible on the project page dropdown or on the commits page. This merge request both actions to the tree header dropdown. Now all repository web actions are available in this one location, plus the existing ones. It makes the operations a lot more intuitive. ## Existing Tree/Repository dropdown: ![Screen_Shot_2015-12-17_at_2.38.50_PM](/uploads/4d83a4b518093ea85f0859b385abcc7c/Screen_Shot_2015-12-17_at_2.38.50_PM.png) ## New Tree/Repository dropdown: ![Screen_Shot_2015-12-17_at_2.32.28_PM](/uploads/1fc18a511774630c5078a7d5c0fbb5b6/Screen_Shot_2015-12-17_at_2.32.28_PM.png)' See merge request !2144
| * | | | | 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 changelog /cc @DouweM See merge request !2149
| * | | | 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.9 See merge request !2143
| * | | 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.1 Improves relative URL support. See merge request !2134
| * | | 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. Close #4131 See merge request !2126
| * | 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] This is needed, because for some projects we have duplicate ci_projects. This was introduced by lack of DB uniqueness on ci_projects.gitlab_id. The MR fixes edge case by selecting value from latest. /cc @yorickpeterse Fixes: gitlab-org/gitlab-ce#4123 See merge request !2133
| * | | Fix ci_projects migration by using the value only from latest row [ci skip]Kamil Trzcinski2015-12-171-1/+2
| | | | | | | | | | | | | | | | | | | | This is needed, because for some projects we have duplicate ci_projects. This was introduced by lack of DB uniqueness on ci_projects.gitlab_id.
* | | | Merge branch 'revert-sidebar' into 'master' Dmitriy Zaporozhets2015-12-178-108/+93
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Revert sidebar position for issue and merge request Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @creamzy @skyruler See merge request !2132
| * | | Revert sidebar position for issue and merge requestDmitriy Zaporozhets2015-12-178-108/+93
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'ux/closed-message' into 'master' Dmitriy Zaporozhets2015-12-174-9/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ux issue with "This issue will be closed automatically" message 1. Make a nice box for "issue will be closed automatically" message 2. move it below emoji navbar. Otherwise looks wierd. Fixes #4134 # Before ![Screenshot_2015-12-17_00.01.03](/uploads/2a24de77f76ce8a8b61ebabd3a02c83a/Screenshot_2015-12-17_00.01.03.png) # After ![Screenshot_2015-12-17_00.03.08](/uploads/ccd21b87b7509e79773fabd179bef4aa/Screenshot_2015-12-17_00.03.08.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2129
| * | Fix ux issue with "This issue will be closed automatically" messageux/closed-messageDmitriy Zaporozhets2015-12-174-9/+4
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'doc_private_registry' into 'master' Achilleas Pipinellis2015-12-171-2/+21
|\ \ | |/ |/| | | | | | | | | Add info on using private Docker registries in CI See merge request !2130
| * 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 user Closes #4112 Note: probably targets the wrong release in the `CHANGELOG`, though 8.4 was not there yet See merge request !2127
| * | Api support for requesting starred projects for userZeger-Jan van de Weg2015-12-164-1/+47
| | | | | | | | | | | | Fixes #4112
* | | Merge branch 'move-mr-builds-tab' into 'master' Dmitriy Zaporozhets2015-12-162-11/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move MR Builds tab next to Commits Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4132 @dzaporozhets We've got two people who feel strongly about this now, @sytses filed an issue for it :) ![Screen_Shot_2015-12-16_at_22.19.35](/uploads/37e705610ba54e386928d7972398c247/Screen_Shot_2015-12-16_at_22.19.35.png) See merge request !2128
| * | | 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 updating and disabling merge button when Merge Immediately is clicked Fixes #4128 See merge request !2124
| * | | 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. See merge request !2125
| * | | | 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 * Fix headings so that they are picked up by doc.gitlab.com * Stick to 80 characters * Clean up some examples See merge request !2052
| * | | | Clean up ci yaml doc [ci skip]yaml-ci-cleanupAchilleas Pipinellis2015-12-161-133/+212
| |/ / / | | | | | | | | | | | | | | | | | | | | * Fix headings so that they are picked up by doc.gitlab.com * Stick to 80 characters * Clean up some examples
* | | | Merge branch 'feature/remove-celluloid' into 'master' Dmitriy Zaporozhets2015-12-162-26/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update rerun to remove celluloid as dependency After sidekiq 4 migration, we no longer need celluloid. `rerun` recent version also removed it from its dependency, so by getting this MR merged, we can solve #3797 See merge request !2088
| * | | | 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 tab Used to link to `gitlab-org/gitlab-ce/commits/<branch-name>`, now links to correct project. See merge request !2115
| | * | | | 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 caching See merge request !2120
| | * | | | | Temporarily disable Markdown cachingDouwe Maan2015-12-161-1/+3
| | |/ / / /
View Lorry Controller Status