Commits · aba0113501aff0a187518673223dab1bb3c3be00 · nexedi / gitlab-ce

18 Dec, 2017 6 commits
- Fix inversed permissions check in cluster forms · aba01135
  Matija Čupić authored Dec 18, 2017
  
  aba01135
- Use helper for feature check in cluster partials · 232d42b7
  Matija Čupić authored Dec 18, 2017
  
  232d42b7
- Add test. Use readonly everywhere · b3cdd336
  Shinya Maeda authored Dec 18, 2017
  
  b3cdd336
- Add update environment scope filed · 232b98b5
  Shinya Maeda authored Dec 18, 2017
  
  232b98b5
- Merge branch 'fix/sm/environment-scope-validation-per-project' into... · 78573248
  Shinya Maeda authored Dec 18, 2017
```
Merge branch 'fix/sm/environment-scope-validation-per-project' into ee-fix-cluster-enviroment-missing
```
  78573248
- Use sequence to reduce change lines · 4dfa6409
  Shinya Maeda authored Dec 18, 2017
  
  4dfa6409
17 Dec, 2017 5 commits
- Add environment scope validation feature spec · 959fe9d5
  Matija Čupić authored Dec 17, 2017
  
  959fe9d5
- Refactor clusters feature spec · cff66a0a
  Matija Čupić authored Dec 17, 2017
  
  cff66a0a
- Fix corrputed tests · fb281d22
  Shinya Maeda authored Dec 18, 2017
  
  fb281d22
- Fix clusters_controller_spec · 4c2a33ce
  Shinya Maeda authored Dec 17, 2017
  
  4c2a33ce
- Fix spec because of missing project for validation · 37ca748c
  Shinya Maeda authored Dec 17, 2017
  
  37ca748c
16 Dec, 2017 7 commits
- Fix usage of instance variable in cluster forms · c12d5a6c
  Matija Čupić authored Dec 16, 2017
  
  c12d5a6c
- Revert save button caption change · 3ed07a66
  Matija Čupić authored Dec 16, 2017
  
  3ed07a66
- Add EE logic to forms environment scope field · 1b681968
  Matija Čupić authored Dec 16, 2017
  
  1b681968
- Add environment scope field to cluster forms · 5e3f0389
  Matija Čupić authored Dec 16, 2017
  
  5e3f0389
- Allow environment_scope in cluster controllers · 12bb147e
  Matija Čupić authored Dec 16, 2017
  
  12bb147e
- Fix validation of duplicated environment scope · 48316183
  Shinya Maeda authored Dec 17, 2017
  
  48316183
- Merge branch 'ee-38019-hide-runner-token' into 'master' · 63ae4e98
  Clement Ho authored Dec 16, 2017
```
Hide runner token in CI/CD settings page -- EE merge edition

Closes gitlab-ce#38019

See merge request gitlab-org/gitlab-ee!3773
```
  63ae4e98
15 Dec, 2017 22 commits
- Merge branch 'fix-wording-add-clusters' into 'master' · a14b25c1
  Filipa Lacerda authored Dec 15, 2017
```
Fix wording in Add Cluster tooltip

See merge request gitlab-org/gitlab-ee!3790
```
  a14b25c1
- Update CHANGELOG.md for 10.2.5 · 56ccc66d
  Michael Kozono authored Dec 15, 2017
```
[ci skip]
```
  56ccc66d
- Update CHANGELOG-EE.md for 10.2.5-ee · 60c8d7a3
  Michael Kozono authored Dec 15, 2017
```
[ci skip]
```
  60c8d7a3
- Merge branch 'ce-to-ee-2017-12-14' into 'master' · 4a195089
  Robert Speicher authored Dec 15, 2017
```
CE upstream - Thursday

Closes #4325, gitlab-ce#36054, #4277, #10, gitlab-ce#33926, gitlab-qa#102, gitaly#793, and gitlab-ce#39608

See merge request gitlab-org/gitlab-ee!3787
```
  4a195089
- Merge branch 'aws-es-connect-when-needed' into 'master' · bd4b5181
  Nick Thomas authored Dec 15, 2017
```
Only try AWS instance profile creds if needed

See merge request gitlab-org/gitlab-ee!3798
```
  bd4b5181
- Hide runner token in CI/CD settings page · db373249
  Eric Eastwood authored Dec 13, 2017
```
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38019
```
  db373249
- Merge branch 'no-ivar-in-modules-ee' into 'master' · 392227ee
  Robert Speicher authored Dec 15, 2017
```
EE:  Add cop to make sure we don't use ivar in a module

See merge request gitlab-org/gitlab-ee!3008
```
  392227ee
- Merge branch 'master' into ce-to-ee-2017-12-14 · a8d9352a
  Nick Thomas authored Dec 15, 2017
  
  a8d9352a
- Merge branch 'fix-wording-add-clusters' of gitlab.com:gitlab-org/gitlab-ee... · 24a39c41
  bikebilly authored Dec 15, 2017
```
Merge branch 'fix-wording-add-clusters' of gitlab.com:gitlab-org/gitlab-ee into fix-wording-add-clusters
```
  24a39c41
- Fix wording in Add Cluster tooltip · e9bcf10f
  bikebilly authored Dec 15, 2017
  
  e9bcf10f
- Merge branch 'patch-4' into 'master' · 3e665261
  Achilleas Pipinellis authored Dec 15, 2017
```
simplify git-annex to LFS migration guide

See merge request gitlab-org/gitlab-ee!2859
```
  3e665261
- simplify git-annex to LFS migration guide · cc22bce1
  Antoine Beaupré authored Dec 15, 2017
  
  cc22bce1
- Fix some EE-only specs · 8000604d
  Nick Thomas authored Dec 15, 2017
  
  8000604d
- Merge branch 'evn-refer-to-runner-sec-docs' into 'master' · 787c954c
  Achilleas Pipinellis authored Dec 15, 2017
```
Add link to runner security

See merge request gitlab-org/gitlab-ee!3725
```
  787c954c
- Add link to runner security · 737cb795
  Ernst van Nierop authored Dec 15, 2017
  
  737cb795
- Merge branch 'ee-rc/use-factory_bot_rails' into 'master' · 4fe186c5
  Robert Speicher authored Dec 15, 2017
```
[EE] Replace factory_girl_rails with factory_bot_rails

See merge request gitlab-org/gitlab-ee!3783
```
  4fe186c5
- Merge branch 'master' into fix-wording-add-clusters · 8155df57
  bikebilly authored Dec 15, 2017
  
  8155df57
- Using `merge_request` in that case would break tests · 4974f15d
  Lin Jen-Shin authored Dec 16, 2017
```
This is a bad smell that we should fix
```
  4974f15d
- Merge branch 'ee-ignore-markdown-cache-when-stubbing-application-settings' into 'master' · 65924174
  Nick Thomas authored Dec 15, 2017
```
Don't use Markdown cache for stubbed settings in specs

See merge request gitlab-org/gitlab-ee!3793
```
  65924174
- Merge branch '41073-fix-help-links' into 'master' · 6d0f5c1c
  Rémy Coutable authored Dec 15, 2017
```
Make help link open in new tab

See merge request gitlab-org/gitlab-ee!3759
```
  6d0f5c1c
- Merge branch '4350-fix-broken-test' into 'master' · 5a64df2f
  Phil Hughes authored Dec 15, 2017
```
Fix broken test mocking the wrong tool

Closes #4350

See merge request gitlab-org/gitlab-ee!3792
```
  5a64df2f
- fixed popup_dialog.vue no longer existing · df070ba6
  Phil Hughes authored Dec 15, 2017
  
  df070ba6