summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Public API support for pipelines for merge requestscreate-pipelines-for-merge-request-serviceShinya Maeda2019-05-024-16/+31
| | | | | | Currently, we don't support pipeline creation for Pipelines for Merge Requests. We add the support with a dedicated pipeline creation service.
* Merge branch ↵Filipa Lacerda2019-05-0214-62/+27
|\ | | | | | | | | | | | | | | | | '59898-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-commits-scss' into 'master' Resolve "Fix the following style-lint errors and warnings for `app/assets/stylesheets/pages/commits.scss`" Closes #59898 See merge request gitlab-org/gitlab-ce!27647
| * Fix commits.scss style-lint errors59898-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-commits-scssScott Hampton2019-04-2514-62/+27
| | | | | | | | Updating class names, and using existing utility classes.
* | Merge branch 'masked-variables-docs-update' into 'master'Filipa Lacerda2019-05-022-4/+6
|\ \ | | | | | | | | | | | | Clarify masked variable message, add docs link See merge request gitlab-org/gitlab-ce!27156
| * | Clarify masked variable message, add link to docsmasked-variables-docs-updatemfluharty2019-04-182-4/+6
| | | | | | | | | | | | | | | | | | Update error message "This variable will not be masked" to "Cannot use Masked Variable with current value" Add link to masked variables section to error message
* | | Merge branch ↵Douwe Maan2019-05-028-16/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobs' into 'master' Disable retrying cancelled jobs Closes #53064 See merge request gitlab-org/gitlab-ce!27503
| * | | Apply suggestion to doc/ci/pipelines.md53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobsMiranda Fluharty2019-05-011-4/+2
| | | |
| * | | Update documentation to explain job retryabilitymfluharty2019-04-231-0/+5
| | | |
| * | | Update specs that use retryable canceled jobsmfluharty2019-04-195-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specs that test canceled jobs now - expect them not to be retryable or playable - expect them not to show retry buttons Specs that test retryability now - use failed status instead of canceled status
| * | | Make canceled jobs not retryablemfluharty2019-04-182-1/+6
| | | | | | | | | | | | | | | | See which tests break
* | | | Merge branch 'patch-52' into 'master'Marcia Ramos2019-05-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fix typo See merge request gitlab-org/gitlab-ce!27907
| * | | | fix typoMorris-Chen2019-04-301-1/+1
| | | | |
* | | | | Merge branch 'jprovazn-graphql-opentracing' into 'master'Bob Van Landuyt2019-05-026-40/+90
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Monitor GraphQL with Opentracing (Jaeger) Closes #48726 See merge request gitlab-org/gitlab-ce!26981
| * | | | | Add opentracing integration for graphqlJan Provaznik2019-05-026-40/+90
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends existing graphql's tracer with opentracing measurements. Because it also adds Tracing::Graphql class (for opentracing), it also renames Graphql::Tracing class to Graphql::GenericTracing to minimize confusion with similar class names.
* | | | | Merge branch 'sh-allow-equal-level-in-subgroup-membership' into 'master'James Lopez2019-05-026-5/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a member to have an access level equal to parent group Closes gitlab-ee#11323 See merge request gitlab-org/gitlab-ce!27913
| * | | | | Allow a member to have an access level equal to parent groupsh-allow-equal-level-in-subgroup-membershipStan Hu2019-04-306-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppose you have this configuration: 1. Subgroup `hello/world` 2. Subgroup `hello/mergers`. 3. Project `hello/world/my-project` has invited group `hello/world` to access protected branches. 4. The rule allows the group to merge but no one can push. 5. User `newuser` has Owner access to the parent group `hello`. Previously, there was no way for the user `newuser` to be added to the `hello/mergers` group since the validation only allowed a user to be added at a higher access level. Since membership in a subgroup confers certain access rights, such as being able to merge or push code to protected branches, we have to loosen the validation and allow someone to be added at an equal level granted by the parent group. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11323
* | | | | | Merge branch 'patch-52' into 'master'Evan Read2019-05-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes a typo in labels.md (Line 45) See merge request gitlab-org/gitlab-ce!27953
| * | | | | | Removes a typo in labels.md (Line 45)NoaHJ2019-05-011-1/+1
| | | | | | |
* | | | | | | Merge branch 'da-sentry-client-side-settings' into 'master'Stan Hu2019-05-016-3/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Sentry client-side DSN to be passed on gitlab.yml See merge request gitlab-org/gitlab-ce!27967
| * | | | | | | Add CHANGELOG entryda-sentry-client-side-settingsDouglas Barbosa Alexandre2019-05-011-0/+5
| | | | | | | |
| * | | | | | | Allow Sentry client-side DSN to be passed on gitlab.ymlDouglas Barbosa Alexandre2019-05-015-3/+6
| | | | | | | |
* | | | | | | | Merge branch 'doc-patch-example-domain' into 'master'Evan Read2019-05-011-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitHub integration instructions to swap example domain to *.example.com (github.md) See merge request gitlab-org/gitlab-ce!19352
| * | | | | | | | Update GitHub integration instructions to swap example domain to ↵Mike Lewis2019-05-011-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | *.example.com (github.md)
* | | | | | | | Merge branch 'patch-51' into 'master'Evan Read2019-05-011-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add example for the artifacts:paths section See merge request gitlab-org/gitlab-ce!27523
| * | | | | | | | Add example for the artifacts:paths sectionBlair Lunceford2019-05-011-2/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'securitytxt' into 'master'John Northrup2019-05-011-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Add a security txt https://securitytxt.org/ See merge request gitlab-org/gitlab-ce!27961
| * | | | | | | Add a security txt https://securitytxt.org/Sid Sijbrandij2019-05-011-0/+6
| | | | | | | |
* | | | | | | | Merge branch 'bertrand-lpl-master-patch-56649' into 'master'docs-subscription-changes-and-dataMike Lewis2019-05-011-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace misinterpreted `|` caracter in a table See merge request gitlab-org/gitlab-ce!25319
| * | | | | | | | Replace misinterpreted `|` caracter in a table Bertrand Jamin2019-02-171-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'js-i18n-notes' into 'master'Clement Ho2019-05-014-8/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of notes directory See merge request gitlab-org/gitlab-ce!27726
| * | | | | | | | | Internationalisation of notes directoryBrandon Labuschagne2019-05-014-8/+31
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | | Merge branch 'js-i18n-behaviors' into 'master'Clement Ho2019-05-015-6/+29
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | i18n the behaviors directory See merge request gitlab-org/gitlab-ce!27637
| * | | | | | | | Internationalisation of behaviors directoryBrandon Labuschagne2019-05-015-6/+29
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | Merge branch 'js-i18n-board' into 'master'Clement Ho2019-05-015-5/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of boards directory See merge request gitlab-org/gitlab-ce!27672
| * | | | | | | | Internationalisation of board directoryBrandon Labuschagne2019-05-015-5/+22
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | Merge branch 'js-i18n-filtered-search' into 'master'Clement Ho2019-05-019-18/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internationalisation of filtered_search directory See merge request gitlab-org/gitlab-ce!27678
| * | | | | | | | Internationalisation of filtered_search directoryBrandon Labuschagne2019-05-019-18/+41
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | Merge branch '9962-ee-diff-note-actions' into 'master'Phil Hughes2019-05-012-9/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Move EE differences for `app/assets/javascripts/notes/components/note_actions.vue`" See merge request gitlab-org/gitlab-ce!27900
| * | | | | | | | Resolve "Move EE differences for ↵Natalia Tepluhina2019-05-012-9/+15
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | `app/assets/javascripts/notes/components/note_actions.vue`"
* | | | | | | | Merge branch '10694-propagate-env-vars-only-if-set-ce' into 'master'Douwe Maan2019-05-012-18/+38
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate ENV vars to SAST and Dependency Scanning Docker containers only if they are set See merge request gitlab-org/gitlab-ce!27659
| * | | | | | | | Propagate ENV vars to SAST and Dependency Scanning Docker containers only if ↵Victor Zagorodny2019-05-012-18/+38
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | they are set
* | | | | | | | Merge branch 'fj-refactor-mirror-instructions-view' into 'master'Sean McGivern2019-05-012-1/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Refactor mirror instructions view See merge request gitlab-org/gitlab-ce!27901
| * | | | | | | Refactor mirror instructions viewFrancisco Javier López2019-05-012-1/+5
|/ / / / / / /
* | | | | | | Merge branch 'bvl-upload-designs-fix-ce' into 'master'Douwe Maan2019-05-012-3/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Gitlab::GlRepository#types an instance method See merge request gitlab-org/gitlab-ce!27902
| * | | | | | | Make Gitlab::GlRepository#types an instance methodBob Van Landuyt2019-04-302-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having this as an instance method makes it easier to override in the prepended `EE` module. If we try to override this method on the module itself, it would not be overridden correctly, depending on the load order.
* | | | | | | | Merge branch 'add-specs-for-group-routing-spec' into 'master'Yorick Peterse2019-05-011-0/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs to group routing spec See merge request gitlab-org/gitlab-ce!27705
| * | | | | | | | Add specs to group routing specadd-specs-for-group-routing-specMałgorzata Ksionek2019-04-261-0/+14
| | | | | | | | |
* | | | | | | | | Merge branch '59974-multiple-dashboards-be' into 'master'Sean McGivern2019-05-0120-108/+563
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve BE for "Load dashboards from project's git repository" Closes #59974 See merge request gitlab-org/gitlab-ce!27608
| * | | | | | | | | Update metrics dashboard API to load yml from repoSarah Yasonik2019-05-0120-108/+563
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the EnvironmentController#metrics_dashboard endpoint to support a "dashboard" param, which can be used to specify the filepath of a dashboard configuration from a project repository. Dashboard configurations are expected to be stored in .gitlab/dashboards/. Updates dashboard post-processing steps to exclude custom metrics, which should only display on the system dashboard.
* | | | | | | | | Merge branch 'add-project-level-config-for-merge-train-ce' into 'master'Sean McGivern2019-05-013-1/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Backport: Add project level config for merge train See merge request gitlab-org/gitlab-ce!27819