Commits · 4b464ffbffcef2b161b20d2b0caf4dd96daf2a6d · nexedi / gitlab-ce

10 Sep, 2018 33 commits
- Merge branch 'ce-to-ee-2018-09-10' into 'master' · 4b464ffb
  Rémy Coutable authored Sep 10, 2018
```
CE upstream - 2018-09-10 10:57 UTC

Closes gitlab-ce#51295

See merge request gitlab-org/gitlab-ee!7305
```
  4b464ffb
- Merge branch 'update-pseudo' into 'master' · 726410b2
  Job van der Voort authored Sep 10, 2018
```
Update pseudo file

See merge request gitlab-org/gitlab-ee!7280
```
  726410b2
- [QA] Fix Geo scenario · 472f1f6d
  Rémy Coutable authored Sep 10, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  472f1f6d
- Merge branch 'ee-lock-unlock-quick-actions' into 'master' · 61052f1a
  Rémy Coutable authored Sep 10, 2018
```
Port of `/lock` and `/unlock` quick actions to EE

See merge request gitlab-org/gitlab-ee!7206
```
  61052f1a
- Merge branch 'ee-improve-chart-index-docs' into 'master' · 91b5b23a
  Achilleas Pipinellis authored Sep 10, 2018
```
Clean up chart index page

See merge request gitlab-org/gitlab-ee!7295
```
  91b5b23a
- Clean up chart index page · 25e6d87a
  Joshua Lambert authored Sep 10, 2018
  
  25e6d87a
- Resolve app/helpers/selects_helper.rb · b3a733f1
  Rémy Coutable authored Sep 10, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  b3a733f1
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-10 · 726743b1
  GitLab Bot authored Sep 10, 2018
```
# Conflicts:
#	app/helpers/selects_helper.rb

[ci skip]
```
  726743b1
- Merge branch... · 94f03227
  Achilleas Pipinellis authored Sep 10, 2018
```
Merge branch 'docs/51295-update-documentation-for-interactive-web-terminals-to-remove-beta-indicator' into 'master'

Remove beta from web terminal documentation

Closes #51295

See merge request gitlab-org/gitlab-ce!21641
```
  94f03227
- Merge branch '50036-document-permissions' into 'master' · 4dc903ec
  Achilleas Pipinellis authored Sep 10, 2018
```
Document permissions for different entities

Closes #50036

See merge request gitlab-org/gitlab-ce!21109
```
  4dc903ec
- Document permissions for different entities · d556eca0
  Jarka Košanová authored Sep 10, 2018
  
  d556eca0
- Merge branch 'qa-fix-specs-runner-when-args-given' into 'master' · 816e846a
  Rémy Coutable authored Sep 10, 2018
```
[QA] Fix arguments passed to RSpec::Core::Runner

See merge request gitlab-org/gitlab-ce!21578
```
  816e846a
- Merge branch 'ce-to-ee-2018-09-10' into 'master' · 14d47ed4
  Bob Van Landuyt authored Sep 10, 2018
```
CE upstream - 2018-09-10 09:22 UTC

Closes gitlab-qa#322

See merge request gitlab-org/gitlab-ee!7303
```
  14d47ed4
- Remove beta from web terminal · 9cf6abb6
  Steve Azzopardi authored Sep 10, 2018
```
closes gitlab-org/gitlab-ce#51295
```
  9cf6abb6
- Merge branch 'frozen-string-enable-app-helpers' into 'master' · a5517ada
  Rémy Coutable authored Sep 10, 2018
```
Enable frozen string for app/helpers/**/*.rb

See merge request gitlab-org/gitlab-ce!21320
```
  a5517ada
- Merge branch 'ee-frozen-string-enable-app-helpers' into 'master' · 77d95a4b
  Rémy Coutable authored Sep 10, 2018
```
EE Port of gitlab-ce!21320 (Enable frozen string for app/helpers/**/*.rb)

See merge request gitlab-org/gitlab-ee!7161
```
  77d95a4b
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-10 · 389e2997
  GitLab Bot authored Sep 10, 2018
  
  389e2997
- Merge branch 'sh-fix-ldap-qa' into 'master' · c777f074
  Rémy Coutable authored Sep 10, 2018
```
Fix LDAP QA specs failing due to button change

See merge request gitlab-org/gitlab-ce!21622
```
  c777f074
- Merge branch 'dks-update-templates-licenses-11-3' into 'master' · 211c1292
  Bob Van Landuyt authored Sep 10, 2018
```
Update templates and licenses for 11.3

See merge request gitlab-org/gitlab-ce!21611
```
  211c1292
- Merge branch 'ce-to-ee-2018-09-10' into 'master' · 10966544
  Bob Van Landuyt authored Sep 10, 2018
```
CE upstream - 2018-09-10 00:21 UTC

See merge request gitlab-org/gitlab-ee!7298
```
  10966544
- Merge branch '51281-on-master-diff-view-contains-extra-and-signs' into 'master' · bcf945a3
  Phil Hughes authored Sep 10, 2018
```
Resolve "On master, inline diff view contains extra `+` and `-` signs"

Closes #51281

See merge request gitlab-org/gitlab-ce!21634
```
  bcf945a3
- Resolve "On master, inline diff view contains extra `+` and `-` signs" · 12b48e61
  Tim Zallmann authored Sep 10, 2018
  
  12b48e61
- Merge branch 'sidekiq-query' into 'master' · 3d1fa790
  Rémy Coutable authored Sep 10, 2018
```
Disable query limit counter in sidekiq

See merge request gitlab-org/gitlab-ce!21470
```
  3d1fa790
- Merge branch 'sidekiq-query-ee' into 'master' · 1eaf66eb
  Rémy Coutable authored Sep 10, 2018
```
[EE] Disable query limit counter in sidekiq

Closes #7087

See merge request gitlab-org/gitlab-ee!7204
```
  1eaf66eb
- Merge branch '7500-use-current-ce-ee-merge-base' into 'master' · d4ab830e
  Rémy Coutable authored Sep 10, 2018
```
Use the current merge base between CE MR and EE MR

See merge request gitlab-org/gitlab-ee!7278
```
  d4ab830e
- Update templates and licenses for 11.3 · 3414f33d
  Diana Stanley authored Sep 07, 2018
  
  3414f33d
- Merge branch 'api-promote-find-branch' into 'master' · cee47fb3
  Rémy Coutable authored Sep 10, 2018
```
API: Use find_branch! in all places

Closes #51250

See merge request gitlab-org/gitlab-ce!21614
```
  cee47fb3
- Merge branch 'sh-fix-failing-instances-statistics-spec' into 'master' · efefc1a6
  Rémy Coutable authored Sep 10, 2018
```
Explicitly enable usage ping for instance statistics spec

Closes #51294

See merge request gitlab-org/gitlab-ce!21629
```
  efefc1a6
- Merge branch 'sh-fix-failing-instances-statistics-spec' into 'master' · bea943ae
  Rémy Coutable authored Sep 10, 2018
```
Explicitly enable usage ping for instance statistics spec

Closes #51294

See merge request gitlab-org/gitlab-ce!21629
```
  bea943ae
- Merge branch 'leipert-ignore-snowplow' into 'master' · 98331af9
  Phil Hughes authored Sep 10, 2018
```
Ignore snowplow for eslint and prettier

See merge request gitlab-org/gitlab-ee!7293
```
  98331af9
- Merge branch 'sh-fix-new-project-qa' into 'master' · 2863fcce
  Grzegorz Bizon authored Sep 10, 2018
```
Fix QA builds failing due to change in new project page behavior

Closes gitlab-qa#322

See merge request gitlab-org/gitlab-ce!21621
```
  2863fcce
- Resolve conflicts in `invite_group_spec.rb` · 7dcef28d
  Bob Van Landuyt authored Sep 10, 2018
  
  7dcef28d
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-10 · 139fc918
  GitLab Bot authored Sep 10, 2018
```
# Conflicts:
#	spec/features/projects/members/invite_group_spec.rb

[ci skip]
```
  139fc918
09 Sep, 2018 7 commits
- Merge branch '38208-due-dates-system-notes' into 'master' · 30227f8e
  Stan Hu authored Sep 09, 2018
```
Add system note when due date is changed

Closes #38208

See merge request gitlab-org/gitlab-ce!21628
```
  30227f8e
- Explicitly enable usage ping for instance statistics spec · 0519c14a
  Stan Hu authored Sep 09, 2018
```
This is similar to https://gitlab.com/gitlab-org/gitlab-ee/issues/7511, but
the root cause is https://gitlab.com/gitlab-org/gitlab-ce/issues/51268.
```
  0519c14a
- Merge branch 'summit-challenge-hc' into 'master' · 03aae652
  Robert Speicher authored Sep 09, 2018
```
Summit challenge - health check

Closes #7345

See merge request gitlab-org/gitlab-ee!6995
```
  03aae652
- Summit challenge - health check · 10747e3e
  Clement Ho authored Sep 09, 2018
  
  10747e3e
- Merge branch 'fix-invite-group-spec-ee' into 'master' · 3fe14f93
  Robert Speicher authored Sep 09, 2018
```
Update invite_group_spec to be consistent with EE

See merge request gitlab-org/gitlab-ce!21608
```
  3fe14f93
- Add system note when due date is changed · 997dda50
  Eva Kadlecová authored Sep 09, 2018
  
  997dda50
- Merge branch 'sh-fix-cohorts-spec-ce' · a81775a0
  Stan Hu authored Sep 09, 2018
  
  a81775a0