Commits · 05c5ec46a96f3a494af0e54f56183bd415f0f731 · nexedi / gitlab-ce

15 Mar, 2020 3 commits
- Revert "Merge branch 'update-sassc' into 'master'" · 05c5ec46
  Stan Hu authored Mar 15, 2020
```
This reverts merge request !27267
```
  05c5ec46
- Merge branch 'pl-status-page-mvc-json-status' into 'master' · 350f0286
  Peter Leitzen authored Mar 15, 2020
```
Expose issue state as `status` on status page

See merge request gitlab-org/gitlab!27272
```
  350f0286
- Merge branch 'update-sassc' into 'master' · 872f0550
  Stan Hu authored Mar 15, 2020
```
Update sassc gem 2.0.1 -> 2.2.1

See merge request gitlab-org/gitlab!27267
```
  872f0550
14 Mar, 2020 7 commits
- Expose issue state as `status` on status page · 8764a223
  Peter Leitzen authored Mar 14, 2020
  
  8764a223
- Update sassc gem 2.0.1 -> 2.2.1 · c26675fc
  Pirate Praveen authored Mar 14, 2020
  
  c26675fc
- Merge branch 'lm-replace-lodash-ee-billings' into 'master' · 62945ef8
  Martin Wortschack authored Mar 14, 2020
```
Replace underscore with lodash in ee/app/assets/javascripts/billing

See merge request gitlab-org/gitlab!27053
```
  62945ef8
- Merge branch 'validate_service_project_id_nil_if_template' into 'master' · ec14149a
  Stan Hu authored Mar 14, 2020
```
Validate absence of project_id if service template

See merge request gitlab-org/gitlab!26563
```
  ec14149a
- Validate absence of project_id if service template · fade1baf
  Andy Soiron authored Mar 14, 2020
```
A serve is not allowed to be a template and a
project service at the same time.
```
  fade1baf
- Merge branch 'validate_service_project_id_nil_if_template' into 'master' · 57810f87
  Stan Hu authored Mar 14, 2020
```
Validate absence of project_id if service template

See merge request gitlab-org/gitlab!26563
```
  57810f87
- Validate absence of project_id if service template · bf857f57
  Andy Soiron authored Mar 14, 2020
```
A serve is not allowed to be a template and a
project service at the same time.
```
  bf857f57
13 Mar, 2020 30 commits
- Merge branch 'update-puma-to-4-3-3' into 'master' · 08ef4da5
  Stan Hu authored Mar 13, 2020
```
Update Puma to 4.3.3

See merge request gitlab-org/gitlab!27232
```
  08ef4da5
- Merge branch 'ajk-remove-design-reference-filter' into 'master' · 8c4718dc
  Mayra Cabrera authored Mar 13, 2020
```
Remove design reference filter

See merge request gitlab-org/gitlab!27112
```
  8c4718dc
- Replace underscore with lodash · 79946e4f
  lauraMon authored Mar 12, 2020
  
  79946e4f
- Merge branch 'fix/prevent-user-theme-color-api-overwrite' into 'master' · 3c1e19ba
  Mayra Cabrera authored Mar 13, 2020
```
Prevent default overwrite for theme and color ID in user API

See merge request gitlab-org/gitlab!26792
```
  3c1e19ba
- Prevent default overwrite for theme and color ID in user API · 25566742
  Fabio Huser authored Mar 13, 2020
  
  25566742
- Merge branch '194207-refactor-notebook-to-sfc' into 'master' · f7699051
  Paul Slaughter authored Mar 13, 2020
```
Refactor notebook_viewer to vue SFC

See merge request gitlab-org/gitlab!27090
```
  f7699051
- Refactor notebook_viewer to vue SFC · 09d02ed1
  Nicolò Maria Mezzopera authored Mar 13, 2020
```
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27090
```
  09d02ed1
- Merge branch '210332-approximate-counters-are-not-working-on-gitlab-com' into 'master' · 4b872ebc
  Mayra Cabrera authored Mar 13, 2020
```
Move approximate counters to batch counting

See merge request gitlab-org/gitlab!27218
```
  4b872ebc
- Move approximate counters to batch counting · e9629b82
  Alina Mihaila authored Mar 13, 2020
  
  e9629b82
- Merge branch 'vs-migrate-custom-metrics-to-jest' into 'master' · 8ca2d45a
  Paul Slaughter authored Mar 13, 2020
```
Migrate ee/custom_metrics to Jest

Closes #194274

See merge request gitlab-org/gitlab!27139
```
  8ca2d45a
- Update Puma to 4.3.3 · 59ce7023
  Kamil Trzciński authored Mar 13, 2020
```
- https://gitlab.com/gitlab-org/gitlab-puma/-/compare/v4.3.1.gitlab.2...v4.3.3.gitlab.2
- Fixes CVE-2020-5247
```
  59ce7023
- Merge branch 'extract-caching-from-github-importer' into 'master' · f1033a33
  Ash McKenzie authored Mar 13, 2020
```
Move Caching module out of GithubImporter namespace to be reused

See merge request gitlab-org/gitlab!27096
```
  f1033a33
- Merge branch 'move-finders-into-ci-namespace' into 'master' · b926e6d0
  Mayra Cabrera authored Mar 13, 2020
```
Move finders related to CI under the namespace

See merge request gitlab-org/gitlab!27190
```
  b926e6d0
- Merge branch '197918-add-package-type-param-to-group-packages-api' into 'master' · 62a458e3
  Mayra Cabrera authored Mar 13, 2020
```
Add package_type as parameter to group packages list api

See merge request gitlab-org/gitlab!26833
```
  62a458e3
- Added package_type to group packages api · d52d97a0
  Nick Kipling authored Mar 13, 2020
```
Added package_type param to api options
Updated tests
Updated documentation
Added changelog entry
```
  d52d97a0
- Merge branch 'move_feature_category_update_repo_worker' into 'master' · 392d2b0d
  Mayra Cabrera authored Mar 13, 2020
```
Move feature category of ProjectUpdateRepositoryStorage to Gitaly

See merge request gitlab-org/gitlab!27165
```
  392d2b0d
- Merge branch 'jivanvl-replace-undercore-lodash-feature-flags' into 'master' · 4ef4f0f1
  Paul Slaughter authored Mar 13, 2020
```
Replace underscore/lodash in feature_flags

Closes #210264

See merge request gitlab-org/gitlab!27130
```
  4ef4f0f1
- Merge branch '194207-refactor-pdf-viewer-to-vue-sfc' into 'master' · d2beeb7e
  Paul Slaughter authored Mar 13, 2020
```
Refactor pdf_viewer to sfc

See merge request gitlab-org/gitlab!26894
```
  d2beeb7e
- Refactor pdf_viewer to sfc · 892338cb
  Nicolò Maria Mezzopera authored Mar 13, 2020
```
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26894
```
  892338cb
- Merge branch 'docs-pipelines-discus' into 'master' · 232c6d22
  Achilleas Pipinellis authored Mar 13, 2020
```
Add disqus redirects to moved docs

See merge request gitlab-org/gitlab!27221
```
  232c6d22
- Merge branch '207488-better-documentation-incident-emails' into 'master' · 3776fdcc
  Achilleas Pipinellis authored Mar 13, 2020
```
Send email notifications for Generic Alerts docs

Closes #207488

See merge request gitlab-org/gitlab!26856
```
  3776fdcc
- Send email notifications for Generic Alerts docs · 2c850f8b
  Sean Arnold authored Mar 13, 2020
  
  2c850f8b
- Merge branch '197897-enable-mr-single_mr_diff_view-feature-flag-by-default-2' into 'master' · 26eaa769
  Paul Slaughter authored Mar 13, 2020
```
Enable MR :single_mr_diff_view feature flag by default

See merge request gitlab-org/gitlab!24821
```
  26eaa769
- Merge branch 'dotenv-report-artifact' into 'master' · 5df1c407
  Mayra Cabrera authored Mar 13, 2020
```
Support DotEnv Variables through report type artifact

See merge request gitlab-org/gitlab!26247
```
  5df1c407
- Merge branch 'update-qa-failure-template' into 'master' · 23c649bf
  Mek Stittri authored Mar 13, 2020
```
Remove ~bug label from QA Failure template

See merge request gitlab-org/gitlab!26989
```
  23c649bf
- Remove ~bug label from QA Failure template · e7921bfd
  Ramya Authappan authored Mar 13, 2020
  
  e7921bfd
- Merge branch 'turn-on-new-variables-ui-ff' into 'master' · 033e4e69
  Sean McGivern authored Mar 13, 2020
```
Turn on new_variables_ui feature flag

See merge request gitlab-org/gitlab!26901
```
  033e4e69
- Merge branch '39173-add-optional-options-param-to-convertobjectpropstosnakecase' into 'master' · a846c20d
  Tim Zallmann authored Mar 13, 2020
```
Add `options` parameter to `convertObjectPropsToSnakeCase`

See merge request gitlab-org/gitlab!25569
```
  a846c20d
- Set dynamic environment URLs after a job finished via dotenv · 5817cc01
  Shinya Maeda authored Feb 26, 2020
```
This commit adds support for `artifacts:report:dotenv`

Minor text changes
```
  5817cc01
- Default the `single_mr_diff_view` FF to true · ab449502
  Thomas Randolph authored Feb 10, 2020
  
  ab449502