summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add modal for stopping jobs in admin areawinh-stop-jobs-modalWinnie Hellmann2018-01-178-10/+156
|
* Merge branch 'feature/39591-visibility-level' into 'master'Clement Ho2018-01-172-1/+6
|\ | | | | | | | | | | | | Open visibility help in new tab Closes #39591 See merge request gitlab-org/gitlab-ce!16268
| * Open visibility help in new tabJussi Räsänen2018-01-172-1/+6
|/
* Merge branch '41874-closed-todo' into 'master'Douwe Maan2018-01-177-13/+25
|\ | | | | | | | | | | | | Resolve "Closed issue label in todo's styling is difficult to read" Closes #41874 See merge request gitlab-org/gitlab-ce!16414
| * Resolve "Closed issue label in todo's styling is difficult to read"Simon Knox2018-01-177-13/+25
|/
* Merge branch '42006-allow-toggling-of-performance-bar-in-development' into ↵Sean McGivern2018-01-174-10/+34
|\ | | | | | | | | | | | | | | | | 'master' Resolve "Allow toggling of performance bar in development" Closes #42006 See merge request gitlab-org/gitlab-ce!16495
| * In development, allow the toggling of the performance barRémy Coutable2018-01-174-10/+34
| | | | | | | | | | | | The performance bar is still displayed by default in development. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'revert-c8ddf067' into 'master'Tim Zallmann2018-01-172-36/+0
|\ \ | |/ |/| | | | | Revert "Merge branch 'pre-commit-prettier' into 'master'" See merge request gitlab-org/gitlab-ce!16217
| * Revert "Merge branch 'pre-commit-prettier' into 'master'"revert-c8ddf067Filipa Lacerda2018-01-044-41/+0
| | | | | | This reverts merge request !16061
* | Merge branch 'add-fast-blank' into 'master'Sean McGivern2018-01-173-0/+10
|\ \ | | | | | | | | | | | | Fast blank can speed things up. Spotify uses it as well… See merge request gitlab-org/gitlab-ce!16468
| * | Use the fast_blank gemadd-fast-blankdosire2018-01-163-0/+10
| | | | | | | | | | | | See https://github.com/rails/rails/pull/24658#issuecomment-212651965
* | | Merge branch 'qa-add-deploy-key-view-elements' into 'master'Grzegorz Bizon2018-01-173-15/+19
|\ \ \ | | | | | | | | | | | | | | | | Add view elements to deploy keys pages See merge request gitlab-org/gitlab-ce!16464
| * | | Try to match more aggressivelyqa-add-deploy-key-view-elementsLin Jen-Shin2018-01-161-2/+3
| | | |
| * | | Add view elements to deploy keys pagesLin Jen-Shin2018-01-153-15/+18
| | | |
* | | | Merge branch '42035-projects-dropdown-scroll' into 'master'Tim Zallmann2018-01-172-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Projects dropdown width and height shrinked, causes scrollbars wrapping around" Closes #42035 See merge request gitlab-org/gitlab-ce!16507
| * | | | Restore custom height for projects dropdown42035-projects-dropdown-scrollAnnabel Dunstone Gray2018-01-162-1/+3
| | |/ / | |/| |
* | | | Merge branch '41118-add-sorting-to-deployments-api' into 'master'Rémy Coutable2018-01-174-6/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Enable ordering and sorting for the Deployments API" Closes #41118 See merge request gitlab-org/gitlab-ce!16396
| * | | | Adds sorting to deployments APIJacopo2018-01-174-6/+59
| | | | | | | | | | | | | | | | | | | | | | | | | Adds sorting to deployments API through the `order_by` and sort `fields`.
* | | | | Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' ↵Filipa Lacerda2018-01-172-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix JS bundle not running on the Cluster update/destroy pages -- CE backport Closes gitlab-ee#4378 See merge request gitlab-org/gitlab-ce!16506
| * | | | | Fix JS bundle not running on the Cluster update/destroy pagesce-backport-4378-fix-cluster-js-not-running-on-update-pageEric Eastwood2018-01-162-0/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ee/issues/4378 Conflicts: app/assets/javascripts/dispatcher.js
* | | | | Merge branch 'remove-branch-names-contains' into 'master'Sean McGivern2018-01-172-39/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove unused methods from Gitlab::Git See merge request gitlab-org/gitlab-ce!16494
| * | | | | Remove unused methods from Gitlab::GitJacob Vosmaer (GitLab)2018-01-172-39/+0
|/ / / / /
* | | | | Merge branch 'merge-request-target-branch-perf' into 'master'Filipa Lacerda2018-01-176-9/+57
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improved performance of merge requests target branch dropdown See merge request gitlab-org/gitlab-ce!16428
| * | | | | fixed missing commamerge-request-target-branch-perfPhil Hughes2018-01-161-1/+1
| | | | | |
| * | | | | actual spec fixesPhil Hughes2018-01-161-0/+1
| | | | | |
| * | | | | more spec fixesPhil Hughes2018-01-162-2/+0
| | | | | |
| * | | | | fixed failing specPhil Hughes2018-01-161-0/+1
| | | | | |
| * | | | | only search branchesPhil Hughes2018-01-163-21/+13
| | | | | | | | | | | | | | | | | | | | | | | | target branch select dropdown doesnt care about tags so we dont need to waste time searching them
| * | | | | Improved performance of merge requests target branch dropdownPhil Hughes2018-01-164-5/+61
| | | | | |
* | | | | | Merge branch '41727-target-branch-name' into 'master'Sean McGivern2018-01-173-0/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set target_branch to the ref branch when creating MR from issue Closes #41727 See merge request gitlab-org/gitlab-ce!16422
| * | | | | | Set target_branch to the ref branch when creating MR from issue41727-target-branch-nameJarka Kadlecová2018-01-173-0/+25
| | | | | | |
* | | | | | | Merge branch '37199-labels-fix' into 'master'Sean McGivern2018-01-173-1/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep subscribers when promoting labels to group labels Closes #37199 See merge request gitlab-org/gitlab-ce!16343
| * | | | | | | Keep subscribers when promoting labels to group labels37199-labels-fixJarka Kadlecová2018-01-123-1/+29
| | | | | | | |
* | | | | | | | Merge branch '41920-download-button' into 'master'Phil Hughes2018-01-175-21/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Download button in pipelines table has wrong height" Closes #41920 and #38653 See merge request gitlab-org/gitlab-ce!16488
| * | | | | | | | Fix broken test41920-download-buttonFilipa Lacerda2018-01-161-0/+1
| | | | | | | | |
| * | | | | | | | Replace pipeline's action icons with svgFilipa Lacerda2018-01-165-21/+14
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/gb/improve-manual-action-tooltips' into 'master'Grzegorz Bizon2018-01-173-5/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix running manual action tooltip Closes #41418 See merge request gitlab-org/gitlab-ce!16489
| * | | | | | | | | Add changelog entry for manual actions tooltip fixfix/gb/improve-manual-action-tooltipsGrzegorz Bizon2018-01-161-0/+5
| | | | | | | | | |
| * | | | | | | | | Fix running manual action tooltipGrzegorz Bizon2018-01-162-5/+8
| | | | | | | | | |
* | | | | | | | | | Merge branch '41929-artifacts-time' into 'master'Tim Zallmann2018-01-173-18/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove "remaining" word from artifacts information in job's page sidebar" Closes #41929 See merge request gitlab-org/gitlab-ce!16405
| * | | | | | | | | | Fix bad import in job.js41929-artifacts-timeFilipa Lacerda2018-01-111-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Remove remaining word from artifacts dateFilipa Lacerda2018-01-113-17/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'sh-add-9-5-10-changelog-docs' into 'master'Simon Knox2018-01-171-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing 9.5.10 CHANGELOG entries See merge request gitlab-org/gitlab-ce!16512
| * | | | | | | | | | Add missing 9.5.10 CHANGELOG entriesStan Hu2018-01-161-0/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'Stan Hu2018-01-163-2/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent RevList failing on non utf8 paths Closes #41627 See merge request gitlab-org/gitlab-ce!16440
| * | | | | | | | | Prevent RevList failing on non utf8 pathsjej/lfs-rev-list-handles-non-utf-paths-41627James Edwards-Jones2018-01-163-2/+16
| | | | | | | | | |
* | | | | | | | | | Merge branch '37898-increase-readability-of-colored-text-in-job-output-log' ↵Annabel Dunstone Gray2018-01-162-15/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' fix readability xterm colors Closes #37898 See merge request gitlab-org/gitlab-ce!15921
| * | | | | | | | | | fix readability xterm colorsDanny2018-01-162-15/+19
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '42047-pg-10-support' into 'master'Nick Thomas2018-01-165-4/+66
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "postgresql 10 support for GitLab" Closes #42047 See merge request gitlab-org/gitlab-ce!16471
| * | | | | | | | | | Update seed-fu to a version compatible with postgresql 10Nick Thomas2018-01-163-3/+12
| | | | | | | | | | |
View Lorry Controller Status