Commits · 80e7e95bfa42e2b7f9382ff8d44a9bd26c5e380d · nexedi / gitlab-ce

12 Sep, 2018 5 commits
- Merge branch 'ce-to-ee-2018-09-11' into 'master' · 80e7e95b
  Stan Hu authored Sep 12, 2018
```
CE upstream - 2018-09-11 18:21 UTC

See merge request gitlab-org/gitlab-ee!7333
```
  80e7e95b
- Merge branch 'new-epic-custom-notifications-docs' into 'master' · 4105c6b6
  Victor Wu authored Sep 12, 2018
```
New epic custom notifications docs

See merge request gitlab-org/gitlab-ee!7336
```
  4105c6b6
- New epic custom notifications docs · 0de65630
  Victor Wu authored Sep 12, 2018
  
  0de65630
- Merge branch 'docs-integrated-milestones-epics' into 'master' · be4cfec6
  Victor Wu authored Sep 12, 2018
```
Docs for integrated milestones

See merge request gitlab-org/gitlab-ee!7337
```
  be4cfec6
- Docs for integrated milestones · 3dba51a6
  Victor Wu authored Sep 12, 2018
  
  3dba51a6
11 Sep, 2018 35 commits
- Merge branch 'add-gitlab-ui-loading-icon-ee' into 'master' · b2e7d584
  Mike Greiling authored Sep 11, 2018
```
Use gitlab-ui loading icon [EE]

See merge request gitlab-org/gitlab-ee!7322
```
  b2e7d584
- Use gitlab-ui loading icon [EE] · 5ced2e6f
  Clement Ho authored Sep 11, 2018
  
  5ced2e6f
- Update EE-only StatusEntity usage · a3c158d3
  Robert Speicher authored Sep 11, 2018
```
This was renamed to DetailedStatusEntity
```
  a3c158d3
- Merge branch '3871-part-4' into 'master' · 100631ed
  Mike Greiling authored Sep 11, 2018
```
Resolve "Move EE JavaScript tests to their own respective directory"

See merge request gitlab-org/gitlab-ee!6663
```
  100631ed
- Fix conflicts in framework/selects.scss · 1c108b8d
  Annabel Dunstone Gray authored Sep 11, 2018
  
  1c108b8d
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-11 · 7eb95816
  GitLab Bot authored Sep 11, 2018
```
# Conflicts:
#	app/assets/stylesheets/framework/selects.scss

[ci skip]
```
  7eb95816
- Merge branch '51375-fix-activity-pages' into 'master' · e91dc8f4
  Robert Speicher authored Sep 11, 2018
```
Fix the group and project activity pages

Closes #51375

See merge request gitlab-org/gitlab-ce!21674
```
  e91dc8f4
- Fix the group and project activity pages · 7dcb91bd
  Nick Thomas authored Sep 11, 2018
  
  7dcb91bd
- Merge branch '51112-add-status-illustration-in-job-api' into 'master' · b65c39ca
  Kamil Trzciński authored Sep 11, 2018
```
Add empty state illustration information in job API

Closes #51112

See merge request gitlab-org/gitlab-ce!21532
```
  b65c39ca
- Add empty state illustration information in job API · e254da81
  Steve Azzopardi authored Sep 11, 2018
  
  e254da81
- Merge branch '7216-rake-geo-status-doesn-t-report-ci-job-artifact-numbers' into 'master' · 7c12cb90
  Douglas Barbosa Alexandre authored Sep 11, 2018
```
Rake geo:status doesn't report CI job artifact numbers

Closes #7216

See merge request gitlab-org/gitlab-ee!7307
```
  7c12cb90
- Merge branch 'rails5-deprecation-warnings-ce' into 'master' · 7dd8d379
  Robert Speicher authored Sep 11, 2018
```
[CE] Fix rails 5 deprecation warnings

See merge request gitlab-org/gitlab-ce!21673
```
  7dd8d379
- Merge branch '50632-combine-color-duplicates' into 'master' · 1254f226
  Clement Ho authored Sep 11, 2018
```
Resolve "[SCSS Variables Cleanup] Combine all duplicated hex colors in variables.scss", Part 1

See merge request gitlab-org/gitlab-ce!21375
```
  1254f226
- Merge branch 'ee-50632-combine-color-duplicates' into 'master' · ac38fed1
  Clement Ho authored Sep 11, 2018
```
EE port of 50632-combine-color-duplicates

See merge request gitlab-org/gitlab-ee!6982
```
  ac38fed1
- Merge branch 'frozen-string-enable-vestigial' into 'master' · 23562699
  Stan Hu authored Sep 11, 2018
```
Enable frozen string in vestigial files

See merge request gitlab-org/gitlab-ce!21665
```
  23562699
- Merge branch '51333-use-rails-root-for-common-metrics-importer' into 'master' · e21f171d
  Grzegorz Bizon authored Sep 11, 2018
```
Use Rails.root for CommonMetricsImporter

Closes #51333

See merge request gitlab-org/gitlab-ce!21664
```
  e21f171d
- Merge branch 'sh-support-adding-confirmed-emails' into 'master' · e68ebdfb
  Robert Speicher authored Sep 11, 2018
```
Add ability to skip user email confirmation with API

Closes #50876

See merge request gitlab-org/gitlab-ce!21630
```
  e68ebdfb
- Fix rails 5 deprecation warnings · 1b42c847
  Jan Provaznik authored Sep 07, 2018
```
Fixes rails 5 deprecation warnings in `config/` files
```
  1b42c847
- rake geo:status doesn't report CI job artifact numbers · 9298d463
  Valery Sizov authored Sep 10, 2018
  
  9298d463
- Merge branch 'ce-to-ee-2018-09-11' into 'master' · 5ee05bbb
  Marin Jankovski authored Sep 11, 2018
```
CE upstream - 2018-09-11 15:21 UTC

Closes #7009

See merge request gitlab-org/gitlab-ee!7331
```
  5ee05bbb
- Use Rails.root for CommonMetricsImporter · fe8b842a
  Kamil Trzciński authored Sep 11, 2018
  
  fe8b842a
- Merge branch 'rails5-deprecation-warnings' into 'master' · ee897025
  Robert Speicher authored Sep 11, 2018
```
Fix rails 5 deprecation warnings

See merge request gitlab-org/gitlab-ee!7324
```
  ee897025
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-11 · 24719881
  GitLab Bot authored Sep 11, 2018
  
  24719881
- Merge branch '50835-add-filtering-sorting-for-labels-on-labels-page' into 'master' · b21625a9
  Dmitriy Zaporozhets authored Sep 11, 2018
```
Add sorting for labels on labels page

See merge request gitlab-org/gitlab-ce!21642
```
  b21625a9
- Merge branch 'fix-namespace-upload' into 'master' · 44931bd2
  Kamil Trzciński authored Sep 11, 2018
```
Fix workhorse temp path for namespace uploads

Closes gitlab-ee#7009

See merge request gitlab-org/gitlab-ce!21650
```
  44931bd2
- Fix workhorse temp path for namespace uploads · 84404352
  Jarka Košanová authored Sep 10, 2018
  
  84404352
- Remove jquery.scss; Combine multiple duplicate grays into global gray... · 0459c78f
  Annabel Dunstone Gray authored Aug 24, 2018
```
Remove jquery.scss; Combine multiple duplicate grays into global gray variables; Remove unused styles in common.scss
```
  0459c78f
- Remove jquery.scss; Combine multiple duplicate grays into global gray... · 70231fc0
  Annabel Dunstone Gray authored Aug 24, 2018
```
Remove jquery.scss; Combine multiple duplicate grays into global gray variables; Remove unused styles in common.scss
```
  70231fc0
- Merge branch '49943-resolve-filter-bar-height-changes' into 'master' · 9b0127e0
  Annabel Dunstone Gray authored Sep 11, 2018
```
Resolve "Filter bar height changes when items are added"

Closes #49943

See merge request gitlab-org/gitlab-ce!21609
```
  9b0127e0
- Resolve "Filter bar height changes when items are added" · 49c565c9
  Andrea Leone authored Sep 11, 2018
  
  49c565c9
- Merge branch 'rails5-before-filter-ee' into 'master' · a23144ee
  Douwe Maan authored Sep 11, 2018
```
Rename before_filter to before_action

See merge request gitlab-org/gitlab-ee!7323
```
  a23144ee
- Merge branch 'ce-to-ee-2018-09-11' into 'master' · a083328a
  Marin Jankovski authored Sep 11, 2018
```
CE upstream - 2018-09-11 12:21 UTC

See merge request gitlab-org/gitlab-ee!7330
```
  a083328a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-11 · d6b691a4
  GitLab Bot authored Sep 11, 2018
  
  d6b691a4
- Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master' · c56f2b96
  Grzegorz Bizon authored Sep 11, 2018
```
Resolve "Project export broken when avatar is set"

Closes #51318

See merge request gitlab-org/gitlab-ce!21649
```
  c56f2b96
- Fix rails 5 deprecation warnings · e08de68f
  Jan Provaznik authored Sep 07, 2018
```
Fixes rails 5 deprecation warnings in `config/` files
```
  e08de68f