summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix whitespace in wiki link filtering specsresolve-spec-differencesYorick Peterse2019-07-291-1/+1
| | | | This ensures this spec is the same in both CE and EE.
* Make usage content spec the same for CE and EEYorick Peterse2019-07-291-1/+9
| | | | | | This changes the spec in question so that it is the same for both CE and EE. This requires an `if Gitlab.ee?` since EE requires that we stub an EE specific module, but doing so in CE will break the spec there.
* Make protected tags spec the same for CE and EEYorick Peterse2019-07-291-0/+6
| | | | | | | This changes a protected tags feature spec so that it is the same in both CE and EE. This requires the use of a `if Gitlab.ee?` check, as the added lines don't work in CE but do work in EE. Removing them entirely in turn breaks the EE spec.
* Backport ToDo feature specs from EEYorick Peterse2019-07-291-7/+35
| | | | This ensures that both CE and EE have the same specs.
* Backport EE changes for the schema specsYorick Peterse2019-07-291-0/+2
| | | | | | This backports two EE specific changes made to the schema changes. We do not yet backport the EE prepend, as this will/can be done when https://gitlab.com/gitlab-org/gitlab-ce/issues/58170 is implemented.
* Merge branch 'docs/ip-access-restriction-ultimate-only' into 'master'51771-notifications-for-when-pipelines-are-fixedMarcia Ramos2019-07-291-1/+1
|\ | | | | | | | | Update IP access restriction docs See merge request gitlab-org/gitlab-ce!31189
| * Update IP access restriction docsCindy Pallares 🦉2019-07-291-1/+1
|/
* Merge branch 'docs/fix-deploy-example' into 'master'Marcia Ramos2019-07-292-13/+22
|\ | | | | | | | | | | | | Fix deploy example and other fixes Closes #65092 See merge request gitlab-org/gitlab-ce!31225
| * Fix deploy example and other fixesEvan Read2019-07-292-13/+22
|/
* Merge branch 'docs/split-autodevops-variable-table' into 'master'Marcia Ramos2019-07-291-36/+59
|\ | | | | | | | | | | | | Categorize autodevops variables Closes #59817 See merge request gitlab-org/gitlab-ce!31226
| * Categorize autodevops variablesEvan Read2019-07-291-36/+59
|/
* Merge branch 'fj-navbar-searches-usage-ping-counter' into 'master'Paul Slaughter2019-07-298-7/+70
|\ | | | | | | | | | | | | Added navbar searches usage ping counter Closes #63887 See merge request gitlab-org/gitlab-ce!30953
| * Added navbar searches usage ping counterFrancisco Javier López2019-07-298-7/+70
|/ | | | | Added usage ping counter when the user makes a search through the navbar search component.
* Merge branch 'projects-controller-private' into 'master'Lin Jen-Shin2019-07-291-10/+12
|\ | | | | | | | | Separate private methods under the keyword on projects controller See merge request gitlab-org/gitlab-ce!31223
| * Separate private methods under the keyword on projects controllerFurkan Ayhan2019-07-281-10/+12
| |
* | Merge branch 'qa-sl-move-mattermost-group-spec' into 'master'Ramya Authappan2019-07-291-0/+0
|\ \ | | | | | | | | | | | | Move create group with mattermost spec to correct dir See merge request gitlab-org/gitlab-ce!31173
| * | Move create group with mattermost spec to correct dirqa-sl-move-mattermost-group-specSanad Liaquat2019-07-261-0/+0
| | |
* | | Merge branch 'frozen_string_spec_features' into 'master'Rémy Coutable2019-07-29521-4/+1046
|\ \ \ | | | | | | | | | | | | | | | | Add frozen_string_literal to spec/features See merge request gitlab-org/gitlab-ce!31131
| * | | Fix can't modify frozen String errorsfrozen_string_spec_featuresThong Kuah2019-07-264-4/+4
| | | | | | | | | | | | | | | | Use unary plus as recommended by Performance/UnfreezeString cop
| * | | Add frozen_string_literal to spec/featuresThong Kuah2019-07-26521-0/+1042
| | | | | | | | | | | | | | | | | | | | Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* | | | Merge branch 'mc/feature/manual-job-variables' into 'master'Phil Hughes2019-07-2929-23/+549
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow specifying variables when running manual jobs Closes #24935 See merge request gitlab-org/gitlab-ce!30485
| * | | | Add Job specific variablesMatija Čupić2019-07-2929-23/+549
|/ / / / | | | | | | | | | | | | | | | | Adds Job specific variables to facilitate specifying variables when running manual jobs.
* | | | Merge branch ↵Kushal Pandya2019-07-295-14/+122
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61787-the-colour-selector-for-broadcast-messages-should-provide-a-few-default-options-with-descriptive-labels-like-red-green-blue' into 'master' Resolve "Add color selector for broadcast messages" Closes #61787 See merge request gitlab-org/gitlab-ce!30988
| * | | | Add default colors for broadcast messages61787-the-colour-selector-for-broadcast-messages-should-provide-a-few-default-options-with-descriptive-labels-like-red-green-blueAmmar Alakkad2019-07-263-14/+62
| | | | |
| * | | | Add color utils with relevant testsAmmar Alakkad2019-07-262-0/+60
| | | | |
* | | | | Merge branch 'add-kub-product-page' into 'master'Evan Read2019-07-291-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add relevant Kubernetes page See merge request gitlab-org/gitlab-ce!30480
| * | | | | Add relevant Kubernetes pageSarah Daily2019-07-291-0/+4
|/ / / / /
* | | | | Merge branch 'docs-ssot-july-3' into 'master'Evan Read2019-07-293-17/+61
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: adere ssot See merge request gitlab-org/gitlab-ce!31182
| * | | | | Docs: adere ssotMarcia Ramos2019-07-293-17/+61
|/ / / / /
* | | | | Merge branch 'docs-ssot-july-1' into 'master'Evan Read2019-07-293-26/+69
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Pipelines - ssot See merge request gitlab-org/gitlab-ce!31179
| * | | | | Docs: Pipelines - ssotMarcia Ramos2019-07-293-26/+69
|/ / / / /
* | | | | Merge branch 'docs-ssot-july-2' into 'master'Evan Read2019-07-291-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Releases - ssot See merge request gitlab-org/gitlab-ce!31180
| * | | | | Releases doc - ssotdocs-ssot-july-2Marcia Ramos2019-07-261-0/+16
| | | | | |
* | | | | | Merge branch 'docs-ssot-july' into 'master'Evan Read2019-07-292-2/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: milestones - ssot See merge request gitlab-org/gitlab-ce!31175
| * | | | | | Milestones docs - ssotdocs-ssot-julyMarcia Ramos2019-07-262-2/+34
| | | | | | |
* | | | | | | Merge branch '52494-remove-unused-cluster-refresh-service' into 'master'Thong Kuah2019-07-296-246/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Remove unused Clusters::RefreshService See merge request gitlab-org/gitlab-ce!31227
| * | | | | | Remove unused Clusters::RefreshServiceTiger2019-07-296-246/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removes all logic from ClusterConfigureWorker and ClusterProjectConfigureWorker, which are also no longer used.
* | | | | | Merge branch 'revert-7dccb444' into 'master'Stan Hu2019-07-279-260/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'" Closes gitlab-ee#13096 See merge request gitlab-org/gitlab-ce!31216
| * | | | | | Revert "Merge branch '52123-issuable-actions-notesfinder-pderichs' into ↵Stan Hu2019-07-279-260/+24
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !29733
* | | | | | Merge branch 'qa-fixing-add_batch_comments' into 'master'Dan Davison2019-07-276-7/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport for changes in EE MR 14746 See merge request gitlab-org/gitlab-ce!30944
| * | | | | | Adding changes to CE from EETomislav Nikic2019-07-276-7/+19
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | All the changes done to files that are also inside CE and need to be ported.
* | | | | | Merge branch '52123-issuable-actions-notesfinder-pderichs' into 'master'Stan Hu2019-07-269-24/+260
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use NotesFinder to fetch notes in module IssuableActions Closes #52123 See merge request gitlab-org/gitlab-ce!29733
| * | | | | | Use NotesFinder in module IssuableActionsPatrick Derichs2019-07-269-24/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec for concern IssuableActions Add shared samples for discussions endpoint Add schema validations for discussions Fix rubocop style issue Make target assignable Use new possibility to provide target
* | | | | | | Merge branch 'update-ruby-version-in-readme' into 'master'Mayra Cabrera2019-07-261-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update ruby version in readme file to match .ruby-version See merge request gitlab-org/gitlab-ce!31185
| * | | | | | | Update ruby version in readme file to match .ruby-versionOsnat Vider2019-07-261-1/+1
|/ / / / / / /
* | | | | | | Merge branch '19186-redirect-wiki-git-route-to-wiki' into 'master'Stan Hu2019-07-264-0/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect project.wiki.git to project wiki home See merge request gitlab-org/gitlab-ce!31085
| * | | | | | | Redirect project.wiki.git to project wiki home19186-redirect-wiki-git-route-to-wikiLuke Duncalfe2019-07-264-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/19186
* | | | | | | | Merge branch 'tp-fix-borked-master' into 'master'Mayra Cabrera2019-07-261-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spec that has broken master Closes #65193 See merge request gitlab-org/gitlab-ce!31198
| * | | | | | | | Changes capybara selector to qa-selectorTanya Pazitny2019-07-261-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Otherwise capybara hits ambiguous match.
* | | | | | | | Merge branch 'frozen_string_spec_lib' into 'master'Stan Hu2019-07-26395-18/+808
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add frozen_string_literal to spec/lib (part 1) See merge request gitlab-org/gitlab-ce!31130