summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* API: Fix booleans not recognized as such when using the `to_boolean` helper23890-api-should-accepts-booleanRémy Coutable2016-10-273-11/+20
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'patch-6' into 'master' Rémy Coutable2016-10-271-0/+16
|\ | | | | | | | | | | | | | | | | Documents that users with two-factor authentication enabled may also need to create a personal access token to use git over HTTPS. To address a support issue (gitlab-com/support-forum#980) about why passwords don't work in git when two-factor auth is enabled. gitlab-com/support-forum#980 See merge request !6616
| * Add info about creating a personal access tokenLucas2016-09-301-0/+16
| |
* | Merge branch '23866-builds-dropdown' into 'master' Fatih Acet2016-10-272-2/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase z index on fixed mr tabs Before: <img src="/uploads/e890a4f185af87b66251d744fbe840d5/Screen_Shot_2016-10-26_at_11.58.45_AM.png" width="400px"> After: <img src="/uploads/0bbf72888f6a47bd3027ee7dfff542da/Screen_Shot_2016-10-26_at_11.58.28_AM.png" width="400px"> Closes #23866 See merge request !7124
| * | Update changelog23866-builds-dropdownAnnabel Dunstone Gray2016-10-261-0/+3
| | |
| * | Increase z index on fixed mr tabsAnnabel Dunstone Gray2016-10-261-2/+2
| | |
* | | Merge branch '21645-mail_room_sentinel'Douwe Maan2016-10-278-8/+108
|\ \ \
| * | | Updated mail_room and added sentinel support to Reply by Email21645-mail_room_sentinelGabriel Mazetto2016-10-268-8/+108
| | | |
* | | | Merge branch 'add-todo-toggle-event' into 'master' remove-tooltip-text-truncation-from-pipeline-graph-build-node-tooltipsFatih Acet2016-10-2715-13/+223
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add todo toggle event ## What does this MR do? Adds a custom jQuery event `todo:toggle` to detect when a new todo is added so that the respective todo counters (header navigation and sidebar) can update as needed ## Are there points in the code the reviewer needs to double check? * I wasn't sure whether each `spec` should be modularized based on the html templates or whether they should be separated based on function. There are some crossovers between the `dashboard_spec` and the `header_spec`. * The naming conventions for `sidebar` and `right_sidebar` were a little confusing since they were named the opposite in their `specs`. I made a few assumptions and named a few files based on what I thought they should be named. I'd be happy to change it to something else though :smile: ## Why was this MR needed? This resolves an existing issue where the todo count on the sidebar would not update (until refresh) and refactors the existing methods that are used to update the todo counters (header navigation and sidebar) ## What are the relevant issue numbers? Closes #20140 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 !5724
| * | | | Add todo toggle eventClement Ho2016-10-2615-13/+223
| | | | |
* | | | | Merge branch '23868-build-graph-tooltips' into 'master' Fatih Acet2016-10-273-7/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove tooltips from build nodes Before: <img src="/uploads/48441dccfe39c5eb1da3dbb9a26e6bd2/Screen_Shot_2016-10-26_at_2.43.46_PM.png" width="400px"> After: <img src="/uploads/d72b2ad4603c964283e155e5a2b053fe/Screen_Shot_2016-10-26_at_2.43.31_PM.png" width="400px"> Closes #23868 See merge request !7128
| * | | | | Remove tooltips from build nodes23868-build-graph-tooltipsAnnabel Dunstone Gray2016-10-263-7/+6
| | | | | |
* | | | | | Merge branch 'issue-boards-new-list-stop-closing' into 'master' Fatih Acet2016-10-273-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create new list dropdown stays open after new list ## What does this MR do? After creating a new list, the dropdown stays open until the user closes the dropdown themselves. ## Screenshots (if relevant) ![keep-open](/uploads/06580dd552647b1a9e5fabc2c978148b/keep-open.gif) ## What are the relevant issue numbers? Closes #22852 See merge request !6742
| * | | | | | Create new list dropdown stays open after new listissue-boards-new-list-stop-closingPhil Hughes2016-10-273-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #22852
* | | | | | | Merge branch '5613-backups-fail' into 'master' Douwe Maan2016-10-273-17/+150
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backups fail occasionally with "tar: ./objects: file changed as we read it" error - [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) Closes #5613 See merge request !5814
| * | | | | | Backups do not fail anymore when using tar on annex and custom_hookstiagonbotelho2016-10-273-17/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | only.
* | | | | | | Merge branch '23258-invalid-encoding' into 'master' Kamil Trzciński2016-10-271-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix encoding issues on pipeline commits ## What does this MR do? #### What does this MR do? Sets `escape: false` on `truncate` method to fix commit message on pipelines page #### Screenshots (if relevant) Before: ![Screen_Shot_2016-10-12_at_8.53.10_AM](/uploads/5e26e98a272139fe2264c315d579178f/Screen_Shot_2016-10-12_at_8.53.10_AM.png) After: ![Screen_Shot_2016-10-12_at_8.52.49_AM](/uploads/58c6c69f2ba735fdcd5a0b6922b56aa7/Screen_Shot_2016-10-12_at_8.52.49_AM.png) #### What are the relevant issue numbers? Closes #23258 See merge request !6832
| * | | | | | | Fix encoding issues on pipeline commits23258-invalid-encodingAnnabel Dunstone Gray2016-10-121-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'delete-branch-remove-tooltip' into 'master' Alfredo Sumaran2016-10-273-25/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed delete branch tooltip ## What does this MR do? Removed the tooltip on the delete branch button & add `aria-label` ## What are the relevant issue numbers? Closes #23253 See merge request !6954
| * | | | | | | | Removed delete branch tooltip and testsdelete-branch-remove-tooltipPhil Hughes2016-10-263-25/+7
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Closes #23253
* | | | | | | | Merge branch 'docs/styleguide-headings' into 'master' Achilleas Pipinellis2016-10-271-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add note about ephemeral statuses in headings See merge request !7131
| * | | | | | | | Add note about ephemeral statuses in headingsAchilleas Pipinellis2016-10-271-1/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'enable-scss-lint-pseudo-element' into 'master' Annabel Dunstone Gray2016-10-2612-28/+28
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable PseudoElement in scss-lint ## What does this MR do? Enables `PseudoElement` in `.scss-lint.yml` ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Improve SCSS maintainability and consistency ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - 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? #23485 See merge request !7083
| * | | | | | | Enable PseudoElement in scss-lintenable-scss-lint-pseudo-elementClement Ho2016-10-2612-28/+28
| |/ / / / / /
* | | | | | | Merge branch '22746-fix-admin-users-mobile-view' into 'master' Annabel Dunstone Gray2016-10-263-0/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Admin/Overview/Users mobile view" ## What does this MR do? Fixes mobile layout issues on `/admin/users` page. * Fixes control element placement when long usernames or email addresses overflow their container * Fixes condensed dropdown menu (issue caused by acde2e30) Before: ![Screen_Shot_2016-09-28_at_3.29.11_PM](/uploads/82cd27c367653beb29425065685274dd/Screen_Shot_2016-09-28_at_3.29.11_PM.png) ![Screen_Shot_2016-09-29_at_23.36.40](/uploads/e739638506388be9c5a0709e5f22b298/Screen_Shot_2016-09-29_at_23.36.40.png) After: ![Screen_Shot_2016-10-24_at_11.55.32_PM](/uploads/ab6e49da85688d9fd2abc49de238a5bf/Screen_Shot_2016-10-24_at_11.55.32_PM.png) ## Are there points in the code the reviewer needs to double check? Ensure css changes don't have any side effects elsewhere in GitLab. (I don't think they would...) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - 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 #22746 See merge request !7087
| * | | | | | update CHANGELOG.md to reflect changes in !708722746-fix-admin-users-mobile-viewMike Greiling2016-10-261-0/+1
| | | | | | |
| * | | | | | prevent long usernames or user emails from breaking mobile layout on ↵Mike Greiling2016-10-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | admin/overview/users
| * | | | | | ensure dropbox width is 240px at minimum (fix issues arising from acde2e30)Mike Greiling2016-10-241-0/+1
| | | | | | |
* | | | | | | Merge branch '23607-mr-pipeline-status' into 'master' Alfredo Sumaran2016-10-263-5/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show full status link on MR & commit pipelines Before: ![Screen_Shot_2016-10-24_at_2.43.09_PM](/uploads/5543b6e134a5349650b24dcb1b1a9082/Screen_Shot_2016-10-24_at_2.43.09_PM.png) After: ![Screen_Shot_2016-10-24_at_2.42.55_PM](/uploads/a561c8708ca2b17d11c0eb9b2cfd0b9b/Screen_Shot_2016-10-24_at_2.42.55_PM.png) Closes #23607 See merge request !7079
| * | | | | | | Update changelog23607-mr-pipeline-statusAnnabel Dunstone Gray2016-10-251-0/+1
| | | | | | | |
| * | | | | | | Show full status link on MR & commit pipelinesAnnabel Dunstone Gray2016-10-242-5/+2
| | | | | | | |
* | | | | | | | Merge branch 'eslint' into 'master' Fatih Acet2016-10-26238-0/+297
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ESLint ## What does this MR do? - create `package.json` - add ESLint dependencies to `package.json` - add JavaScript linting to CI - add Rake task `lint:javascript`as alias for `eslint` (which itself is an alias for `npm run eslint`) ## Are there points in the code the reviewer needs to double check? Probably not. ## Why was this MR needed? My hovercraft was full of eels. ## What are the relevant issue numbers? - https://gitlab.com/gitlab-org/gitlab-ce/issues/13224#note_12537431 - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5006#note_13255658 See merge request !5445
| * | | | | | | | disable ESLint for all JavaScript fileswinniehell2016-10-26231-0/+231
| | | | | | | | |
| * | | | | | | | make build fail for ESLint errorswinniehell2016-10-261-1/+0
| | | | | | | | |
| * | | | | | | | add Rake tasks eslint and lint:javascriptwinniehell2016-10-262-0/+16
| | | | | | | | |
| * | | | | | | | add JavaScript linting to CI (!5445)winniehell2016-10-261-0/+9
| | | | | | | | |
| * | | | | | | | add ESLintwinniehell2016-10-264-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ESLint config: https://github.com/airbnb/javascript
* | | | | | | | | Merge branch ↵Annabel Dunstone Gray2016-10-261-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '23661-lacking-padding-on-syntax-highlight-blocks-in-diff-comments' into 'master' Resolve "Lacking padding on syntax highlight blocks in diff comments" ## What does this MR do? Enforces horizontal padding on highlight block. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? There was no horizontal padding on diff comment highlight blocks. ## Screenshots (if relevant) ![Screen_Shot_2016-10-23_at_01.48.10](/uploads/6d7a426c0856e8787b63b2c02672298a/Screen_Shot_2016-10-23_at_01.48.10.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23661 See merge request !7062
| * | | | | | | | | Fix horizontal padding for highlight blocks23661-lacking-padding-on-syntax-highlight-blocks-in-diff-commentsLuke Bennett2016-10-251-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch ↵Alfredo Sumaran2016-10-265-14/+20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '21988-refactor-less-readable-existance-checking-code-from-coffeescript' into 'master' Refactored less readable existance checks ## What does this MR do? Clean up complex JavaScript expressions generated by conditional assignment and existence checks in CoffeeScript. These are small changes that effect 1 or 2 lines at a time, but should make sections of code more readable. ## Are there points in the code the reviewer needs to double check? Changes in [gl_dropdown.js](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/assets/javascripts/gl_dropdown.js) don't do much (largely just splitting stuff onto multiple lines). Is this a bit pointless? ## Why was this MR needed? Auto-generated JS contains complex expressions that will be difficult to work with in future. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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? A child issue of #21887 Closes #21988 See merge request !6289
| * | | | | | | | | | Refactored less readable existance checksJack Davison2016-10-265-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CoffeeScript generated JavaScript contains some unreadable expressions. This refactoring addresses complex uses of the exestential operator that produced unreadable Javascript.
* | | | | | | | | | | Merge branch 'docs/jira-service-api' into 'master' Achilleas Pipinellis2016-10-261-19/+27
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add all endoints to JIRA service API documentation ## What does this MR do? Add missing API endpoints to the JIRA service. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/440 See merge request !7122
| * | | | | | | | | | | Add missing API endpoints to JIRA service API documentationAchilleas Pipinellis2016-10-261-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/440
* | | | | | | | | | | | Merge branch 'dont-test-ee_compat_check-on-master' into 'master' Robert Speicher2016-10-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to run `ee_compat_check` against `master` See merge request !7119
| * | | | | | | | | | | | We don't need to run ee_compat_check against masterRémy Coutable2016-10-261-0/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'docs-trigger-variable' into 'master' Achilleas Pipinellis2016-10-261-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a trigger variable to docs trigger job See merge request !7089
| * | | | | | | | | | | | Restrict docs trigger job only to gitlab-org/gitlab-cedocs-trigger-variableAchilleas Pipinellis2016-10-251-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use the alpine Docker image for docs triggerAchilleas Pipinellis2016-10-251-2/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add a variable to docs trigger and set Git strategy to noneAchilleas Pipinellis2016-10-251-1/+4
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'voogsgerd/gitlab-ce-daniel-cssclassvisable'Rémy Coutable2016-10-262-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | See merge request !7086