summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix some errors in Markdown filesdocs/fix-more-errorsEvan Read2019-07-174-5/+5
|
* Merge branch 'ci-job-only-except-conflict-specs' into 'master'59381-cannot-show-closed-milestones-on-milestones-pageThong Kuah2019-07-161-62/+184
|\ | | | | | | | | Added specs for CI Job inclusion when only: and except: both match See merge request gitlab-org/gitlab-ce!30057
| * Build instead of createci-job-only-except-conflict-specsdrew cimino2019-07-161-1/+1
| |
| * Polish for Ci::Pipeline::Seed::Build specsdrew cimino2019-07-111-62/+143
| |
| * Added specs for Ci::Pipeline::Seed::Builddrew cimino2019-07-111-8/+49
| | | | | | | | - #included? when only: and except: both match
* | Merge branch 'dz-remove-old-ignore-column' into 'master'Robert Speicher2019-07-166-20/+0
|\ \ | | | | | | | | | | | | Remove old ignore_column in AR models See merge request gitlab-org/gitlab-ce!30725
| * | Remove old ignore_column in AR modelsdz-remove-old-ignore-columnDmitriy Zaporozhets2019-07-156-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Next models are affected: * Project * Namespace * Issue * Merge request * CI Trigger * CI Pipeline schedule Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'jc-fix-rugged-feature-flag-rake' into 'master'Stan Hu2019-07-161-3/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add unset_rugged rake task Closes #64441 See merge request gitlab-org/gitlab-ce!30636
| * | | Add unset_rugged rake taskjc-fix-rugged-feature-flag-rakeJohn Cai2019-07-111-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | Adds an unset_rugged rake task that unsets all rugged feature flags. Also fixes the existing disable_rugged task to have it explicitly disable feature flags instead of just unsetting them.
* | | | Merge branch 'rename-banzai-redactors' into 'master'Douglas Barbosa Alexandre2019-07-169-13/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Rename Redactor classes to ReferenceRedactor See merge request gitlab-org/gitlab-ce!30408
| * | | | Rename Redactor classes to ReferenceRedactorSarah Yasonik2019-07-169-13/+13
|/ / / /
* | | | Merge branch '56883-add-prometheus-settings-to-gitlab-yml' into 'master'Stan Hu2019-07-165-0/+492
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Service to create self monitoring project See merge request gitlab-org/gitlab-ce!30153
| * | | | Don't use transactions and exceptionsReuben Pereira2019-07-165-0/+492
|/ / / / | | | | | | | | | | | | Instead return error objects.
* | | | Merge branch 'unlink-metrics-feature-flags' into 'master'Stan Hu2019-07-162-78/+137
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor EnvironmentsController#metrics_dashboard endpoint See merge request gitlab-org/gitlab-ce!30782
| * | | | Refactor EnvironmentsController#metrics_dashboard endpointSarah Yasonik2019-07-162-78/+137
|/ / / /
* | | | Merge branch 'docs/rs-fix-clusters-lint' into 'master'Robert Speicher2019-07-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve docs lint failure in users/clusters/applications.md Closes #64670 See merge request gitlab-org/gitlab-ce!30805
| * | | | Resolve docs lint failure in users/clusters/applications.mdRobert Speicher2019-07-161-1/+1
|/ / / /
* | | | Merge branch '61613-spacing-mr-widgets' into 'master'Phil Hughes2019-07-1614-41/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align merge request icons and text Closes #61613 See merge request gitlab-org/gitlab-ce!28561
| * | | | Align merge request icons and textJarek Ostrowski2019-07-1614-41/+58
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align icons left Align text left Adjust padding to be consistent Make icons same 24 size Add changelog mr number Add right margin to widget status container Add left margin inside widget icon container Prepend left padding for error message Only give button left margin, some have buttons Prettify Adjust test summary icons Prettify Fix empty line before lint Remove author Switch to use gl-padding Use utility classes instead Prettify Change loading icon size to md Update summary_row.vue
* | | | Merge branch 'fix-prometheus-docs-typo' into 'master'Achilleas Pipinellis2019-07-161-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update weight/priority definitions in prometheus dashboard docs See merge request gitlab-org/gitlab-ce!30793
| * | | | Update weight/priority definitions in prometheus dashboard docsSarah Yasonik2019-07-161-3/+1
|/ / / /
* | | | Merge branch 'danger-apply-suggestions-72-chars' into 'master'Lin Jen-Shin2019-07-161-10/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Do not fail danger if suggestion commit msg > 72 See merge request gitlab-org/gitlab-ce!30090
| * | | | Do not fail danger if suggestion commit msg > 72Achilleas Pipinellis2019-07-161-10/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | We have another rule that requires squash enabled when suggestions are applied. No need to fail the ones that are more than 72 characters long since they will be squashed anyway.
* | | | Merge branch '60666-kubernetes-applications-uninstall-runner' into 'master'Kamil Trzciński2019-07-168-20/+79
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Resolve "Kubernetes > Applications > Uninstall Runner" See merge request gitlab-org/gitlab-ce!30176
| * | | | Enable GitLabb runner to be uninstalled from clusterJoão Cunha2019-07-168-20/+79
|/ / / / | | | | | | | | | | | | | | | | | | | | - Set as uninstallable app - Update docs - Adjust specs
* | | | Merge branch '35757-add-result-to-request' into 'master'Dmitriy Zaporozhets2019-07-164-15/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add response to move multiple issues request See merge request gitlab-org/gitlab-ce!30400
| * | | | Modified spec so a second call to json_response is avoided35757-add-result-to-requestPatrick Derichs2019-07-161-2/+7
| | | | |
| * | | | Use match_array instead of includePatrick Derichs2019-07-161-1/+1
| | | | |
| * | | | Add result to MoveService#execute_multiplePatrick Derichs2019-07-164-16/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It adds a hash response which includes the count, success state and the moved issues itself so the caller has additional information about the result of the process.
* | | | | Merge branch 'vue-file-list-breadcrumb-dropdown' into 'master'Filipa Lacerda2019-07-168-15/+296
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added add to tree dropdown to Vue files breadcrumb Closes #62865 See merge request gitlab-org/gitlab-ce!30177
| * | | | | Added add to tree dropdown to Vue files breadcrumbPhil Hughes2019-07-158-15/+296
| | | | | |
* | | | | | Merge branch 'fix-create-mr-enabling-button' into 'master'Filipa Lacerda2019-07-162-1/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed create merge request button not enabling Closes #64454 See merge request gitlab-org/gitlab-ce!30776
| * | | | | | Fixed create merge request button not enablingPhil Hughes2019-07-162-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64454
* | | | | | | Merge branch 'bjk/fix_prom_example' into 'master'Achilleas Pipinellis2019-07-162-7/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: Update example Prometheus scrape config See merge request gitlab-org/gitlab-ce!30739
| * | | | | | | Update example Prometheus scrape configbjk/fix_prom_exampleBen Kochie2019-07-152-7/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a full real-world example that is compatible with the omnibus dashboards and follows Prometheus best practices.
* | | | | | | | Merge branch 'rake-db-migrate-status-fix-docs' into 'master'Achilleas Pipinellis2019-07-161-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rake db:migrate:status typo in docs Closes #63908 See merge request gitlab-org/gitlab-ce!30785
| * | | | | | | | Fix rake db:migrate:status typo in docsGreg Myers2019-07-161-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'auto-devops-group-level' into 'master'Achilleas Pipinellis2019-07-161-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note in the docs about possibility of disabling Auto DevOps at group-level for self-managed instances See merge request gitlab-org/gitlab-ce!30781
| * | | | | | | | Note in the docs about possibility of disabling Auto DevOps at group-level ↵Muhamed Huseinbašić2019-07-161-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | for self-managed instances
* | | | | | | | Merge branch 'fj-refactor-web-ide-commits-counter' into 'master'James Lopez2019-07-168-39/+89
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor WebIdeCommitsCount class See merge request gitlab-org/gitlab-ce!30726
| * | | | | | | | Refactored WebIdeCommitsCount classFrancisco Javier López2019-07-168-39/+89
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're adding more redis base counters to the web ide and other classes. We're refactoring this class in other to use the logic in other places.
* | | | | | | | Merge branch 'docs-10078-dependencies-api' into 'master'Achilleas Pipinellis2019-07-162-0/+51
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Docs Dependencies API See merge request gitlab-org/gitlab-ce!30623
| * | | | | | | Docs Dependencies APITetiana Chupryna2019-07-162-0/+51
|/ / / / / / /
* | | | | | | Merge branch 'telemetry-37-bug-with-snowplow-structured-events' into 'master'Fatih Acet2019-07-1611-16/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport: Removed non-decimal event values See merge request gitlab-org/gitlab-ce!30684
| * | | | | | | CE backport: Removed non-decimal event valuesDonald Cook2019-07-1611-16/+16
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snowplow only accepts decimals for value This MR removes sending of value implicitly with the value attribute
* | | | | | | Merge branch 'remove-support-for-legacy-pipeline-triggers' into 'master'Kamil Trzciński2019-07-1614-73/+240
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove support for legacy pipeline triggers Closes #30231 See merge request gitlab-org/gitlab-ce!30133
| * | | | | | | Do not import legacy triggers from project JSONremove-support-for-legacy-pipeline-triggersFabio Pitino2019-07-153-3/+22
| | | | | | | |
| * | | | | | | Ensure ImportExport maintains trigger ownershipFabio Pitino2019-07-152-1/+2
| | | | | | | |
| * | | | | | | Allow use of legacy triggers with feature flagFabio Pitino2019-07-1511-69/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep feature flag disabled by default and turn off all functionality related to legacy triggers. * Block legacy triggers from creating pipeline * Highlight legacy triggers to be invalid via the UI * Make legacy triggers invalid in the model
* | | | | | | | Merge branch 'issue-64070-asciidoctor-section-anchors' into 'master'Bob Van Landuyt2019-07-164-2/+103
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable section anchors Closes #64070 See merge request gitlab-org/gitlab-ce!30666