summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo, s/hit/click, remove whitespacesautodevops-docs-updateAchilleas Pipinellis2018-10-231-20/+19
|
* update for claritydanielgruesso2018-10-231-14/+14
|
* Merge branch 'autodevops-docs-update' of gitlab.com:gitlab-org/gitlab-ce ↵danielgruesso2018-10-181-26/+39
|\ | | | | | | | | | | | | into autodevops-docs-update # Conflicts: # doc/topics/autodevops/index.md
| * Edits to Auto DevOps docMike Lewis2018-10-171-33/+46
| |
* | Updates based on tech writer feedback.danielgruesso2018-10-181-5/+10
|/
* Further clarification on instance level vs project level enablement.danielgruesso2018-10-171-8/+12
|
* clarify auto review apps deployment, jobs skipped by license, disabling at ↵danielgruesso2018-10-161-14/+30
| | | | instance level, and diff between .com and self-managed
* Merge branch 'prettify-all-the-things-5' into 'master'Tim Zallmann2018-10-1014-128/+93
|\ | | | | | | | | Prettify all the things (part 5) See merge request gitlab-org/gitlab-ce!22255
| * Prettify ide modulesMike Greiling2018-10-1014-128/+93
| |
* | Merge branch 'prettify-all-the-things-2' into 'master'Tim Zallmann2018-10-1056-1523/+1546
|\ \ | | | | | | | | | | | | Prettify all the things (part 2) See merge request gitlab-org/gitlab-ce!22250
| * | Prettify merge_conflicts monitoring and notebook modulesMike Greiling2018-10-1019-354/+341
| | |
| * | Prettify lib/utils modulesMike Greiling2018-10-1014-89/+131
| | |
| * | Prettify issue_show and jobs modulesMike Greiling2018-10-1023-1080/+1074
| |/
* | Merge branch ↵Clement Ho2018-10-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '52103-dropzone-css-is-failing-to-load-on-rspec-dev-and-staging-11-4-0-rc' into 'master' Resolve "Dropzone css is failing to load on rspec, dev and staging 11.4.0 RC" Closes #52103 See merge request gitlab-org/gitlab-ce!22272
| * | Remove file extension to force sprockets to inline dropzone cssMike Greiling2018-10-101-1/+1
| | |
* | | Merge branch 'mg-update-issue-board-components' into 'master'Fatih Acet2018-10-1031-261/+261
|\ \ \ | | | | | | | | | | | | | | | | Convert remaining issue board components into ES module syntax See merge request gitlab-org/gitlab-ce!22210
| * | | Convert remaining issue board components into ES module syntaxMike Greiling2018-10-1031-261/+261
|/ / /
* | | Merge branch 'ml-qa-register-user-failure' into 'master'Rémy Coutable2018-10-104-23/+41
|\ \ \ | |/ / |/| | | | | | | | QA: Retry registration before failing See merge request gitlab-org/gitlab-ce!22033
| * | Retry registration 3 times before failingMark Lapierre2018-10-104-23/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | Registration intermittently fails without an obvious cause. The action to click the button seems to move focus to the right button but nothing happens. This change attempts to retry the action under the assumption that Capybara or Chrome is misbehaving. It also updates the selectors for the sign up page.
* | | Merge branch ↵Rémy Coutable2018-10-103-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-quality-nightly-22-fix-uninitialized-constant-QA-Page-Menu-qa' into 'master' [QA] Fix a wrong constant name Closes gitlab-org/quality/nightly#22 See merge request gitlab-org/gitlab-ce!22264
| * | | [QA] Fix a wrong constant nameRémy Coutable2018-10-103-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Menu namespace was changed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22115 and https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7799. Fixes https://gitlab.com/gitlab-org/quality/nightly/issues/22. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'add-allowance-for-feature-flag-after-ff' into 'master'Robert Speicher2018-10-101-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add allowance to merge feature flags MRs See merge request gitlab-org/gitlab-ce!22267
| * | | | Add allowance to merge feature flags MRsSteve Azzopardi2018-10-101-0/+1
| | |/ / | |/| | | | | | | | | | | | | | After the 7th it is OK to merge code changes that are merged as long it is behind a feature flag.
* | | | Merge branch 'add-top_upstream_source_sha-in-trigger-build' into 'master'Rémy Coutable2018-10-101-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add `TOP_UPSTREAM_SOURCE_SHA` in `scripts/trigger-build` See merge request gitlab-org/gitlab-ce!22260
| * | | | Improve the variables passed in trigger-buildRémy Coutable2018-10-101-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the variable names consistent by following the `TOP_UPSTREAM_SOURCE_*` pattern. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Pass 'TOP_UPSTREAM_SOURCE_SHA' in trigger-buildRémy Coutable2018-10-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed because `GITLAB_VERSION` has a special meaning in `omnibus-gitlab` triggers: this is the GitLab version to build. The problem is that `omnibus-gitlab` also has triggers to run QA for an `omnibus-gitlab` commit, and if we use `GITLAB_VERSION` in that case, the comment would be posted on the GitLab CE/EE commit (stored in `GITLAB_VERSION`), whci hwouldn't make any sense. Thus we need `TOP_UPSTREAM_SOURCE_SHA` to represent the commit on which we want to leave a comment. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'enhance-deployment-json-schema' into 'master'Sean McGivern2018-10-103-5/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enhance and test JSON schema for deployments See merge request gitlab-org/gitlab-ce!22266
| * | | | | Enhance and test JSON schema for deploymentsPeter Leitzen2018-10-103-5/+62
| | |_|/ / | |/| | |
* | | | | Merge branch 'docs/fix-link-to-eslint-config' into 'master'Achilleas Pipinellis2018-10-101-52/+57
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Fix broken link and file improvements See merge request gitlab-org/gitlab-ce!22244
| * | | | Fix broken linkEvan Read2018-10-101-52/+57
| | | | | | | | | | | | | | | | | | | | | | | | | Also includes some basic fixes to Markdown to make it adhere to styleguide.
* | | | | Merge branch 'dimitrieh-master-patch-11276' into 'master'Rémy Coutable2018-10-101-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Add in review specifics See merge request gitlab-org/gitlab-ce!22242
| * | | | Add in review specificsDimitrie Hoekstra2018-10-091-1/+1
| |/ / /
* | | | Merge branch 'zj-circuit-breaker-removal' into 'master'Douwe Maan2018-10-1061-2058/+65
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Git circuit breaker Closes #45405 See merge request gitlab-org/gitlab-ce!22212
| * | | | Remove Git circuit breakerZeger-Jan van de Weg2018-10-1061-2058/+65
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Was introduced in the time that GitLab still used NFS, which is not required anymore in most cases. By removing this, the API it calls will return empty responses. This interface has to be removed in the next major release, expected to be 12.0.
* | | | Merge branch '7631-remove-security-report-summary-from-pipelines-view' into ↵Fatih Acet2018-10-101-2/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 'master' Backport of CE changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7844 See merge request gitlab-org/gitlab-ce!22221
| * | | Remove security report summary from pipelines viewLukas Eipert2018-10-091-2/+0
| | | | | | | | | | | | | | | | | | | | This removes the Vue component, corresponding tests and haml/bundle entry points for the Security Report summary in the pipelines view
* | | | Merge branch 'docs/service-template' into 'master'Marcia Ramos2018-10-101-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Clarify what happens when enabling a service template See merge request gitlab-org/gitlab-ce!22240
| * | | | Clarify what happens when enabling a service templateAchilleas Pipinellis2018-10-091-2/+4
| | | | |
* | | | | Merge branch 'docs-update-nfs-ha-git_data_dirs' into 'master'Marcia Ramos2018-10-101-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update the HA NFS docs See merge request gitlab-org/gitlab-ce!22239
| * | | | | update the HA NFS docsabuerer2018-10-091-2/+2
| |/ / / /
* | | | | Merge branch 'docs/autodevops-enable-auto' into 'master'Marcia Ramos2018-10-101-10/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move the Auto DevOps note to the top See merge request gitlab-org/gitlab-ce!21745
| * | | | | Move the Auto DevOps note to the topAchilleas Pipinellis2018-10-091-10/+12
| |/ / / /
* | | | | Merge branch 'ml-qa-add-file-templates' into 'master'Sean McGivern2018-10-1021-26/+377
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add test of adding file templates via Web IDE and Files view See merge request gitlab-org/gitlab-ce!21914
| * | | | | Add tests of adding file templatesMark Lapierre2018-10-0921-26/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tests that adds new files via file templates via the Files view and the Web IDE. Includes changes to page objects and associated code Fetches template content from the API rather than hardcoding strings that will need to be updated if the templates change. Some of the content is stored as flat files but we can't use them because they're not included in the docker images gitlab-qa uses.
* | | | | | Merge branch 'jej/inline-rspec-filepath-cop' into 'master'Rémy Coutable2018-10-101-1/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Inline RSpec/FilePath rubocop rule See merge request gitlab-org/gitlab-ce!22233
| * | | | | Inline RSpec/FilePath rubocop ruleJames Edwards-Jones2018-10-091-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves RSpec/FilePath cop from gitlab-styles, so we can specify filepaths to ignore without hardcoding them in the gem.
* | | | | | Merge branch 'priority-bug-sla-clarity' into 'master'Mek Stittri2018-10-101-6/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Clarify SLA for defects See merge request gitlab-org/gitlab-ce!22229
| * | | | | Clarify SLA for defectsMek Stittri2018-10-091-6/+6
| | | | | |
* | | | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-10-091-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicated item in Administration Documentation See merge request gitlab-org/gitlab-ce!21933
| * | | | | | Remove duplicated item in Administration DocumentationMichael Bisbjerg2018-10-091-2/+1
|/ / / / / /