summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* sync sidebar DOM state on page:change to minimize split-second appearance of ↵19183-refactor-sidebar-jsMike Greiling2016-09-071-3/+2
| | | | the sidebar in certain situations
* remove dead code - 'collapsed_nav' cookie no longer used since a1fbdbb6 (see ↵Mike Greiling2016-09-073-39/+1
| | | | MR !4579)
* remove superfluous "collapsed" class and rename header classes for clarityMike Greiling2016-09-075-34/+8
|
* refactor sidebar logic into singleton classMike Greiling2016-09-075-83/+104
|
* Merge branch 'replace-animate-emoji-timeout' into 'master' Fatih Acet2016-09-074-49/+39
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace animateEmoji timeout with eventListener ## What does this MR do? Replaces the end animation timeout for awards_handler.js with an eventListener that listens for the animationEnd event ## Are there points in the code the reviewer needs to double check? Check for any side effects ## Why was this MR needed? Improve code quality so that it is easier to understand ## What are the relevant issue numbers? Closes #20679 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5690
| * Replace animateEmoji timeout with eventListenerClement Ho2016-09-064-49/+39
| |
* | Merge branch 'refactor/ci-config-add-logical-validation' into 'master' Rémy Coutable2016-09-0720-187/+318
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass dependencies to CI configuration nodes ## What does this MR do? This MR makes it possible to pass dependencies to CI configuration nodes. ## What are the relevant issue numbers? See #15060 ## Does this MR meet the acceptance criteria? - Tests - [x] Added for this feature/bug - [x] All builds are passing See merge request !6009
| * \ Merge branch 'master' into refactor/ci-config-add-logical-validationrefactor/ci-config-add-logical-validationGrzegorz Bizon2016-09-03432-3219/+7040
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (414 commits) Remove suggested colors hover underline Fix markdown anchor icon interaction Fix expiration date picker after update Refactored code to rely less on IDs that could change Move CHANGELOG entry for !5858 from 8.11 to 8.12 Hides merge request section in edit project when disabled Fix a typo Change minimum Unicorns required to two Update memory requirements Added `.term-bold` declaration. Change the inline code to codeblocks for the new features doc guideline Fix GitLab import button Rename behaviour to behavior in bug issue template for consistency Convert datetime coffeescript spec to ES6 Align add button on repository view Update CHANGELOG with 8.11.4 entries. removed null return - renamed 'placeTop' to 'placeProfileAvatarsToTop' Refactor Ci::Build#raw_trace Move CHANGELOG entry to a proper version Change widths of content in MR pipeline tab ... Conflicts: lib/gitlab/ci/config/node/jobs.rb
| * | | Use double instead of spy in job config node specsGrzegorz Bizon2016-09-031-1/+1
| | | |
| * | | Add method that returns commands for ci job entryGrzegorz Bizon2016-08-295-31/+50
| | | |
| * | | Do not override job nodes in legacy ci config codeGrzegorz Bizon2016-08-291-5/+5
| | | |
| * | | Make it possible to inherit global ci config nodesGrzegorz Bizon2016-08-293-8/+80
| | | |
| * | | Add [] method for accessing ci entry dependenciesGrzegorz Bizon2016-08-252-0/+27
| | | |
| * | | Remove temporary stub method from ci config nodesGrzegorz Bizon2016-08-258-26/+24
| | | |
| * | | Expose compose method in the ci config entry nodesGrzegorz Bizon2016-08-256-44/+47
| | | |
| * | | Rename unspecified and undefined CI config nodesGrzegorz Bizon2016-08-259-98/+103
| | | |
| * | | Inject dependencies into each CI config entry nodeGrzegorz Bizon2016-08-255-8/+15
| | | |
* | | | Merge branch 'fix-allowed-conflict-size' into 'master' Rémy Coutable2016-09-073-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix merge conflict size limit ## What does this MR do? The merge conflict size limit was set to 100 KB, but the docs (and the test repo, which the feature specs use) say 200 KB! ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? Derp. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6052
| * | | | Fix merge conflict size limitfix-allowed-conflict-sizeSean McGivern2016-09-073-3/+4
| | | | |
* | | | | Merge branch 'search-helper-escape-regexp' into 'master' Rémy Coutable2016-09-073-1/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape search terms before passing to Regexp ## What does this MR do? Use `Regexp.escape` to escape the search terms before passing them to `Regexp.new`. ## Why was this MR needed? - evaluated regular expressions in search terms lead to unexpected result - unbalanced parentheses in search term lead to server error ## TODO - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added ## What are the relevant issue numbers? fixes #14360 See merge request !6241
| * | | | | Escape search term before passing it to Regexp.new (!6241)winniehell2016-09-072-1/+4
| | | | | |
| * | | | | Add failing test for #14360winniehell2016-09-071-0/+4
| | | | | |
* | | | | | Merge branch 'zj-use-project-finder-pipelines-api' into 'master' Rémy Coutable2016-09-075-20/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use PipelinesFinder in Pipelines API ## What does this MR do? Sort output for the API endpoint, and uses the PipelinesFinder there. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21566 See merge request !6094
| * | | | | | Use PipelinesFinder in Pipelines APIZ.J. van de Weg2016-09-075-20/+78
| | | | | | |
* | | | | | | Merge branch 'shortcuts-modal-fix' into 'master' Fatih Acet2016-09-071-273/+274
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix styling of shortcuts modal ## What does this MR do? Fixes some weird height issue in the shortcuts modal. ## Screenshots (if relevant) ### Before ![Screen_Shot_2016-09-07_at_15.13.09](/uploads/5c4d7716e355794c8aa9764e0fa53f4e/Screen_Shot_2016-09-07_at_15.13.09.png) ### After ![Screen_Shot_2016-09-07_at_15.12.57](/uploads/6f5c145963b4b89910be44b6b254e117/Screen_Shot_2016-09-07_at_15.12.57.png) See merge request !6244
| * | | | | | | Fix styling of shortcuts modalPhil Hughes2016-09-071-273/+274
| | | | | | | |
* | | | | | | | Merge branch 'issues-filters-reset-btn' into 'master' Fatih Acet2016-09-075-10/+114
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add issues filters reset btn ## What does this MR do? Adds a button to the issues filter to reset all filters. I also lightly refactored a nearby method. ## Are there points in the code the reviewer needs to double check? At the moment, the user can click the reset button even when no filters have been set. I didn't really like how it looked flashing the link on and off depending on whether a user had added a filter. I prefer having it there all the time, so the user is aware of it. But it wouldn't be difficult to hide if no filters have been set, if that's preferred. ## Why was this MR needed? So users can reset filters when they're filtering issues. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/14016 ## Screenshots (if relevant) ![reset-filters](/uploads/562916158ce7b0179794e19f88f5c2e3/reset-filters.png) ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [X] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if you do - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5330
| * | | | | | | Merge branch 'master' into issues-filters-reset-btnBryce Johnson2016-09-0712-13/+176
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Simulate filtering with url params, clean up accordingly.Bryce Johnson2016-09-071-44/+7
| | | | | | | |
| * | | | | | | Add failing reset all test.Bryce Johnson2016-09-071-6/+11
| | | | | | | |
| * | | | | | | Merge branch 'master' into issues-filters-reset-btnBryce Johnson2016-09-0734-165/+336
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into issues-filters-reset-btnBryce Johnson2016-09-066-43/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into issues-filters-reset-btnBryce Johnson2016-09-06100-664/+1167
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add user to project.Bryce Johnson2016-09-061-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Refactor filters reset test to re-use issues.Bryce Johnson2016-09-051-26/+40
| | | | | | | | | | |
| * | | | | | | | | | Revise test error messages to be more reaadble.Bryce Johnson2016-09-051-9/+9
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into issues-filters-reset-btnBryce Johnson2016-09-0518-91/+190
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use broader js flag.Bryce Johnson2016-09-051-5/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Clean reset filters test.Bryce Johnson2016-09-051-26/+27
| | | | | | | | | | | |
| * | | | | | | | | | | Add tests for reset filters button.Bryce Johnson2016-09-021-0/+97
| | | | | | | | | | | |
| * | | | | | | | | | | Add issues filters reset btn (ES6-ified).Bryce2016-09-024-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Also refactored checkChanged slightly.)
* | | | | | | | | | | | Merge branch 'patch-5' into 'master' Rémy Coutable2016-09-071-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: Switch sample values for $CI_SERVER_REVISION and $CI_SERVER_VERSION. See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html. ## What does this MR do? There is a sample in this document showing the possible values of the predefined CI variables. Those of **CI_SERVER_REVISION** and **CI_SERVER_VERSION** were mixed up. I fixed that. See merge request !6243
| * | | | | | | | | | | Fix: Switch sample values for $CI_SERVER_REVISION and $CI_SERVER_VERSION.Patrick Thaele2016-09-071-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '15571-api-for-ci-lint' into 'master' Rémy Coutable2016-09-079-9/+172
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API for CI Lint ## What does this MR do? Add API for CI Lint. Can check if `.gitlab-ci.yml` content is valid. ## What are the relevant issue numbers? Closes #15571 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] API support added - [x] Documentation - Tests - [x] Added for this feature/bug - [x] All builds are passing cc @ubudzisz @grzesiek @yorickpeterse See merge request !5953
| * | | | | | | | | | | | Improve curl commend, remove blank linesKatarzyna Kobierska2016-09-072-3/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix invalid curl commandKatarzyna Kobierska2016-09-073-44/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | Improve documentation grammarKatarzyna Kobierska2016-09-071-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Improve documentationKatarzyna Kobierska2016-09-071-24/+65
| | | | | | | | | | | | |
| * | | | | | | | | | | | Rename file and update READMEKatarzyna Kobierska2016-09-073-3/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move ci_lint to api/ciKatarzyna Kobierska2016-09-073-2/+2
| | | | | | | | | | | | |
View Lorry Controller Status