Commits · fafe591d12802d2f4576f7667a7d0cd551f7d3d5 · nexedi / gitlab-ce

25 Apr, 2018 12 commits
- Clear local storage after test so it's not interfering · fafe591d
  Lin Jen-Shin authored Apr 25, 2018
  
  fafe591d
- Select everything so we could hit protect · 13532353
  Lin Jen-Shin authored Apr 25, 2018
```
Add missing QA selectors as well
```
  13532353
- Merge branch 'ce-to-ee-2018-04-25' into 'master' · 51125bfb
  Marin Jankovski authored Apr 25, 2018
```
CE upstream - 2018-04-25 09:26 UTC

See merge request gitlab-org/gitlab-ee!5478
```
  51125bfb
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-25 · 0b1c796f
  GitLab Bot authored Apr 25, 2018
  
  0b1c796f
- Merge branch 'osw-backport-dev-env-check-for-storage-settings-deprecation' into 'master' · e6f6f8e7
  Rémy Coutable authored Apr 25, 2018
```
Backport dev env check for storage settings deprecation

See merge request gitlab-org/gitlab-ce!18461
```
  e6f6f8e7
- Merge branch 'osw-avoid-noisy-warnings-on-test-env' into 'master' · 67b18509
  Rémy Coutable authored Apr 25, 2018
```
Avoid noisy deprecation warnings on test env

See merge request gitlab-org/gitlab-ee!5473
```
  67b18509
- Merge branch 'blackst0ne-replace-spinach-admin-license.feature' into 'master' · 77bea357
  Rémy Coutable authored Apr 25, 2018
```
Replace the `admin/license.feature` spinach test with an rspec analog

See merge request gitlab-org/gitlab-ee!5477
```
  77bea357
- Replace the `admin/license.feature` spinach test with an rspec analog · 3a1ffbf6
  blackst0ne authored Apr 25, 2018
  
  3a1ffbf6
- Merge branch 'fix-settings-preloading' into 'master' · 772b6b08
  Rémy Coutable authored Apr 25, 2018
```
Do not preload settings

See merge request gitlab-org/gitlab-ce!18566
```
  772b6b08
- Merge branch '3064-group-burndown-chart' into 'master' · 60039b36
  Sean McGivern authored Apr 25, 2018
```
Resolve "Burndown chart for group milestone"

Closes #3064

See merge request gitlab-org/gitlab-ee!5354
```
  60039b36
- Merge branch 'ce-to-ee-2018-04-24' into 'master' · 03e16029
  Lin Jen-Shin authored Apr 25, 2018
```
CE upstream - 2018-04-24 15:49 UTC

See merge request gitlab-org/gitlab-ee!5471
```
  03e16029
- Merge branch '45725-broken-master' into 'master' · 19d7a18a
  Clement Ho authored Apr 24, 2018
```
Resolve "Broken master with `static_analysis` and `karma` being broken"

Closes #45725

See merge request gitlab-org/gitlab-ce!18569
```
  19d7a18a
24 Apr, 2018 28 commits
- Merge branch 'winh-mock-pager' into 'master' · ab7b01aa
  Clement Ho authored Apr 24, 2018
```
Mock Pager in Karma tests

See merge request gitlab-org/gitlab-ce!18556
```
  ab7b01aa
- Mock Pager in Karma tests · 92be3461
  Winnie Hellmann authored Apr 24, 2018
  
  92be3461
- Backport dev env check for storage settings deprecation · 132f7d33
  Oswaldo Ferreira authored Apr 18, 2018
  
  132f7d33
- Return false for test envs on Gitlab.dev_or_com? call · dd6774f2
  Oswaldo Ferreira authored Apr 24, 2018
```
The behavior was moved to ApplicationSetting#should_check_namespace_plan? in order to it keep being tested on test environments without needing a explicit stub
```
  dd6774f2
- Move the push_to_empty_repo to the user_access spec · f2a1bd6c
  Bob Van Landuyt authored Apr 24, 2018
  
  f2a1bd6c
- Resolve conflicts in `spec/models/project_spec.rb` | take 2 · 742dd303
  Bob Van Landuyt authored Apr 24, 2018
  
  742dd303
- Do not preload settings · 575302c1
  Kamil Trzciński authored Apr 24, 2018
  
  575302c1
- Merge branch '45725-broken-master' into 'master' · 87cdd43b
  Clement Ho authored Apr 24, 2018
```
Resolve "Broken master with `static_analysis` and `karma` being broken"

Closes #45725

See merge request gitlab-org/gitlab-ce!18569
```
  87cdd43b
- Merge branch '5751-geo-undefined-method-pending_delete-for-nil-nilclass' into 'master' · bd54136e
  Stan Hu authored Apr 24, 2018
```
Resolve "Geo: undefined method `pending_delete?' for nil:NilClass in geo/repository_verification/secondary/single_worker.rb"

Closes #5751

See merge request gitlab-org/gitlab-ee!5470
```
  bd54136e
- Update import on actions file to fix conflict when rewire plugin was added · e73b9812
  Filipa Lacerda authored Apr 24, 2018
  
  e73b9812
- Resolve conflicts in spec/models/project_spec.rb · 3ad47965
  Sean McGivern authored Apr 24, 2018
  
  3ad47965
- Merge branch 'patch-29' into 'master' · 1aa11de1
  Rémy Coutable authored Apr 24, 2018
```
Broken link fix

See merge request gitlab-org/gitlab-ce!18564
```
  1aa11de1
- Resolve conflicts in spec/factories/projects.rb · a379eb99
  Sean McGivern authored Apr 24, 2018
  
  a379eb99
- Resolve conflicts in quick_actions/interpret_service_spec.rb · 9cb21bf9
  Sean McGivern authored Apr 24, 2018
  
  9cb21bf9
- Resolve conflicts in doc/user/project/quick_actions.md · d0de51e1
  Sean McGivern authored Apr 24, 2018
  
  d0de51e1
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-24 · 28046b90
  GitLab Bot authored Apr 24, 2018
```
# Conflicts:
#	doc/user/project/quick_actions.md
#	spec/factories/projects.rb
#	spec/models/project_spec.rb
#	spec/services/quick_actions/interpret_service_spec.rb

[ci skip]
```
  28046b90
- Merge branch 'ce-to-ee-2018-04-24' into 'master' · 1a4b6568
  James Edwards-Jones authored Apr 24, 2018
```
CE upstream - 2018-04-24 12:36 UTC

See merge request gitlab-org/gitlab-ee!5467
```
  1a4b6568
- Merge branch 'matbaj/gitlab-ce-add-inherit-command' into 'master' · 878ad484
  Rémy Coutable authored Apr 24, 2018
```
Add copy_metadata quick action

Closes #38450

See merge request gitlab-org/gitlab-ce!18497
```
  878ad484
- Merge branch 'ee-matbaj/gitlab-ce-add-inherit-command' into 'master' · 5ade9350
  Rémy Coutable authored Apr 24, 2018
```
Add copy_metadata quick action

See merge request gitlab-org/gitlab-ee!5433
```
  5ade9350
- Merge branch 'bvl-fix-maintainer-push-error' into 'master' · 906fc00c
  Douwe Maan authored Apr 24, 2018
```
Fix errors on pushing/editing files on empty repositories

Closes #44618 and #42583

See merge request gitlab-org/gitlab-ce!18462
```
  906fc00c
- Add CHANGELOG · 1378380b
  Douglas Barbosa Alexandre authored Apr 24, 2018
  
  1378380b
- Fix undefined method pending_delete for nil class · d1a3aef5
  Douglas Barbosa Alexandre authored Apr 24, 2018
  
  d1a3aef5
- Merge branch 'jr-40616-external-lfs-docs' into 'master' · 17ffd998
  Douwe Maan authored Apr 24, 2018
```
Add documentation for externally hosted LFS objects

See merge request gitlab-org/gitlab-ce!18508
```
  17ffd998
- Merge branch '30998-add-babel-rewire-plugin' into 'master' · b173e564
  Clement Ho authored Apr 24, 2018
```
Resolve "Add some way to mock and spy on default ES modules"

Closes #30998

See merge request gitlab-org/gitlab-ce!18116
```
  b173e564
- Broken link fix · 52dfdcf7
  Ana Karabanova 🐱 authored Apr 24, 2018
  
  52dfdcf7
- Merge branch 'ee-30998-add-babel-rewire-plugin' into 'master' · aa78453c
  Clement Ho authored Apr 24, 2018
```
EE Port of "Add some way to mock and spy on default ES modules"

See merge request gitlab-org/gitlab-ee!5447
```
  aa78453c
- EE Port of "Add some way to mock and spy on default ES modules" · b80c7551
  Mike Greiling authored Apr 24, 2018
  
  b80c7551
- add merge request ref to changelog entry · 0c1cd35b
  Mike Greiling authored Apr 19, 2018
  
  0c1cd35b