summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Only render toolbar on metrics dashboardce-adriel-hide-toolbar-cluster-healthAdriel Santiago2019-06-063-1/+43
| | | | Remove empty toolbar from cluster health
* Merge branch 'pages-domain_ssl-valid-period' into 'master'Nick Thomas2019-06-068-2/+155
|\ | | | | | | | | Add certificate valid time to pages domain table See merge request gitlab-org/gitlab-ce!28743
| * Add certificate valid time to pages domain tableVladimir Shushlin2019-06-068-2/+155
|/ | | | | Save certificate validity time for pages domains on save Fill validity time for existing pages domains in background migration
* Merge branch ↵Nick Thomas2019-06-061-112/+26
|\ | | | | | | | | | | | | 'ce-11314-elasticsearch-rake-tasks-should-respect-new-elasticsearch-limited-namespaces-projects-functionality' into 'master' Update docs for Elasticsearch indexing tasks See merge request gitlab-org/gitlab-ce!29132
| * Update docs for Elasticsearch indexing tasksce-11314-elasticsearch-rake-tasks-should-respect-new-elasticsearch-limited-namespaces-projects-functionalityMarkus Koller2019-06-061-112/+26
| |
* | Merge branch 'ce-update-es-indexer' into 'master'Rémy Coutable2019-06-061-1/+1
|\ \ | | | | | | | | | | | | CE port of "Update the elasticsearch indexer" See merge request gitlab-org/gitlab-ce!29237
| * | Update the elasticsearch indexerNick Thomas2019-06-061-1/+1
| | |
* | | Merge branch 'feature/gb/use-gitlabktl-to-build-serverless-applications' ↵Kamil Trzciński2019-06-062-8/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Use `gitlabktl` to build serverless applications Closes #61184 See merge request gitlab-org/gitlab-ce!29258
| * | | Fix typo in a changelog descriptionGrzegorz Bizon2019-06-062-8/+7
|/ / / | | | | | | | | | [ci skip]
* | | Merge branch 'fix/gb/fix-serverless-apps-deployment-template' into 'master'Kamil Trzciński2019-06-062-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix serverless apps deployments by bumping `tm` version Closes #62543 See merge request gitlab-org/gitlab-ce!29254
| * | | Fix serverless app deployments by bumping `tm` versionGrzegorz Bizon2019-06-062-1/+6
|/ / / | | | | | | | | | | | | Previous version of the `tm` tool had a bug that resulted in not being able to deploy serverless applications using this version.
* | | Merge branch '62706-graphql-complexity-values-are-incorrectly-doubled' into ↵Jan Provaznik2019-06-065-27/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Reduce GraphQL complexity for non-connection fields Closes #62706 See merge request gitlab-org/gitlab-ce!29165
| * | | Grab field_defn to access certain values62706-graphql-complexity-values-are-incorrectly-doubledBrett Walker2019-06-051-2/+4
| | | |
| * | | Use :complexity_multiplier only with connectionsBrett Walker2019-06-055-27/+41
| | | | | | | | | | | | | | | | This helps reduce complexity for non-connections
* | | | Merge branch 'enforce-template-uniqueness' into 'master'Grzegorz Bizon2019-06-061-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Ensure that template is used once See merge request gitlab-org/gitlab-ce!27511
| * | | | Ensure that template is used onceKamil Trzciński2019-06-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds additional test that make sure that each template name is used exactly once across all folders exposed
* | | | | Merge branch 'fix/gb/remove-serverless-app-build-policies-from-template' ↵Kamil Trzciński2019-06-062-6/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove build policies from serverless app template Closes #62792 See merge request gitlab-org/gitlab-ce!29253
| * | | | | Remove build policies from serverless app templateGrzegorz Bizon2019-06-062-6/+5
|/ / / / /
* | | | | Merge branch '37495' into 'master'Kushal Pandya2019-06-0611-20/+110
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add docs link for confidential and locked issues Closes #37495 See merge request gitlab-org/gitlab-ce!29073
| * | | | Add doc links for confidential and locked issuesFatih Acet2019-06-0611-20/+110
|/ / / / | | | | | | | | | | | | | | | | With this commit, we add docs link for confidential and locked issues to note compose and edit forms
* | | | Merge branch ↵Filipa Lacerda2019-06-068-16/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '59376-Report-abuse-to-GitLab-should-be-Report-abuse-in-non-gitlab.com-instances' into 'master' Change "Report abuse to GitLab" to more generic wording. Closes #59376 See merge request gitlab-org/gitlab-ce!28884
| * | | | Change "Report abuse to GitLab" to more generic wording.Marc Schwede2019-06-068-16/+21
|/ / / /
* | | | Merge branch 'copy-button-in-modals' into 'master'Filipa Lacerda2019-06-064-0/+180
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a New Copy Button That Works in Modals Closes #60988 See merge request gitlab-org/gitlab-ce!28676
| * | | | Add a New Copy Button That Works in ModalsAndrew Fontaine2019-06-064-0/+180
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This copy button manages a local instance of the Clipboard plugin specific to it, which means it is created/destroyed on the creation/destruction of the component. This allows it to work well in gitlab-ui modals, as the event listeners are bound on creation of the button. It also allows for bindings to the `container` option of the Clipboard plugin, which allows it to work within the focus trap set by bootstrap's modals.
* | | | Merge branch 'always-show-pipelines-must-succeed-checkbox' into 'master'Filipa Lacerda2019-06-064-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always show "Pipelines must succeed" checkbox Closes #57291 See merge request gitlab-org/gitlab-ce!28651
| * | | | Always show "Pipelines must succeed" checkboxFabio Pitino2019-06-064-7/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Before: the checkbox was hidden if builds were disabled. The checkbox should not be linked to the builds feature because they are 2 separate functionality.
* | | | Merge branch 'sh-default-visibility-fix' into 'master'Bob Van Landuyt2019-06-065-1/+119
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set project default visibility to max allowed Closes #62298 See merge request gitlab-org/gitlab-ce!28754
| * | | | Apply suggestion to app/helpers/visibility_level_helper.rbsh-default-visibility-fixBob Van Landuyt2019-06-061-1/+1
| | | | |
| * | | | Set project default visibility to max allowedStan Hu2019-06-055-1/+119
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the default, instance-wide visibility were set to internal but a group were private, the radio button would be set on internal even though that setting were not allowed. We now consider the allowed visibility setting for the group in determining what the default should be. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62298
* | | | Merge branch 'ci-variable-expression-con-dis-junction' into 'master'Kamil Trzciński2019-06-0624-264/+957
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CI variable expression conjunction/disjunction See merge request gitlab-org/gitlab-ce!27925
| * | | | && and || operators for CI Pipeline expressions.drew cimino2019-06-0424-264/+957
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored regex pattern matching to eagerly return tokens Packaged behind a default-enabled feature flag and added operator documentation.
* | | | | Merge branch 'revert-86900f00' into 'master'Grzegorz Bizon2019-06-067-19/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Disable retrying cancelled jobs" Closes #62350 See merge request gitlab-org/gitlab-ce!29201
| * | | | | Revert "Merge branch..."revert-86900f00Kamil Trzciński2019-06-057-19/+16
| | | | | | | | | | | | | | | | | | This reverts merge request !27503
* | | | | | Merge branch 'docs/port-insights-from-ee' into 'master'Achilleas Pipinellis2019-06-061-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port EE changes from doc/user/project/insights/index.md Closes gitlab-ee#11974 See merge request gitlab-org/gitlab-ce!29252
| * | | | | | Port EE changes from doc/user/project/insights/index.mdAchilleas Pipinellis2019-06-061-1/+2
| | | | | | |
* | | | | | | Merge branch '62760-quarantine-it' into 'master'Rémy Coutable2019-06-061-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine spec/models/ci/pipeline_schedule_spec.rb Closes #62760 See merge request gitlab-org/gitlab-ce!29257
| * | | | | | Quarantine this flaky testLin Jen-Shin2019-06-061-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/62760
* | | | | | Merge branch 'docs-api-merge-2' into 'master'Achilleas Pipinellis2019-06-065-105/+378
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Merge 5 api docs from EE to CE See merge request gitlab-org/gitlab-ce!28633
| * | | | | | Docs: Merge 5 api docs from EE to CEMarcel Amirault2019-06-065-105/+378
|/ / / / / /
* | | | | | Merge branch 'simplify-pipeline-notification-check' into 'master'Sean McGivern2019-06-062-13/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify notification check for participating See merge request gitlab-org/gitlab-ce!29188
| * | | | | | Simplify notification check for participatingsimplify-pipeline-notification-checkHeinrich Lee Yu2019-06-062-13/+4
| | | | | | |
* | | | | | | Merge branch 'ce-10854-elasticsearch_avoid_db' into 'master'Sean McGivern2019-06-068-4/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of 10854-elasticsearch_avoid_db See merge request gitlab-org/gitlab-ce!28579
| * | | | | | | Backport of 10854-elasticsearch_avoid_dbce-10854-elasticsearch_avoid_dbMario de la Ossa2019-06-058-4/+15
| | | | | | | |
* | | | | | | | Merge branch 'docs/ssot_saml_sso' into 'master'Achilleas Pipinellis2019-06-061-7/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit "SAML SSO" for SSOT See merge request gitlab-org/gitlab-ce!29248
| * | | | | | | | Edit "SAML SSO" for SSOTRussell Dickenson2019-06-061-7/+23
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/ssot_roadmap' into 'master'Achilleas Pipinellis2019-06-061-2/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit Group's "Roadmap" for SSOT See merge request gitlab-org/gitlab-ce!29245
| * | | | | | | | Edit Group's "Roadmap" for SSOTRussell Dickenson2019-06-061-2/+25
|/ / / / / / / /
* | | | | | | | Merge branch '60323-inline-validation-for-users-name-and-username-length' ↵Kushal Pandya2019-06-069-44/+138
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Inline validation for user's name and username length" Closes #60323 See merge request gitlab-org/gitlab-ce!28095
| * | | | | | | | Resolve "Inline validation for user's name and username length"Jiaan2019-06-069-44/+138
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/fix-bullet-list-ha' into 'master'Achilleas Pipinellis2019-06-061-53/+48
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown for HA topic See merge request gitlab-org/gitlab-ce!29244