Commits · bd19a0e71fbdd7ebeb27dbab495bf38c4e80286a · nexedi / gitlab-ce

28 Feb, 2019 40 commits
- Merge branch 'noteable-discussion-ee-differences' into 'master' · bd19a0e7
  Filipa Lacerda authored Feb 28, 2019
```
Move EE differences out of CE diff files

Closes #9959 and #10001

See merge request gitlab-org/gitlab-ee!9762
```
  bd19a0e7
- Automatic merge of gitlab-org/gitlab-ce master · e95ea33b
  GitLab Bot authored Feb 28, 2019
  
  e95ea33b
- Merge branch 'patch-31' into 'master' · 7d121601
  Douwe Maan authored Feb 28, 2019
```
Update best_practices.md let section to also reference let! variables.

See merge request gitlab-org/gitlab-ce!22496
```
  7d121601
- Merge branch 'sso-dedicated-group-accounts-relations' into 'master' · 6fa5916d
  James Lopez authored Feb 28, 2019
```
Add dedicated group relation to user & group classes

See merge request gitlab-org/gitlab-ee!9663
```
  6fa5916d
- Automatic merge of gitlab-org/gitlab-ce master · 02c75cfd
  GitLab Bot authored Feb 28, 2019
  
  02c75cfd
- Merge branch 'qa-de-quarantine-oauth-tests' into 'master' · 239beb5c
  Rémy Coutable authored Feb 28, 2019
```
Revert "Quarantine GitHub OAuth test"

Closes gitlab-org/quality/nightly#83

See merge request gitlab-org/gitlab-ce!25636
```
  239beb5c
- Automatic merge of gitlab-org/gitlab-ce master · ba24d17b
  GitLab Bot authored Feb 28, 2019
  
  ba24d17b
- Move EE differences out of CE diff files · 50ed1875
  Phil Hughes authored Feb 28, 2019
```
Moved batch comments code out of CE files as much as possible
Made DraftNote component an async import
The async import will resolve to an empty component in CE

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/10001 https://gitlab.com/gitlab-org/gitlab-ee/issues/9959
```
  50ed1875
- Merge branch 'web-ide-default-merge-request' into 'master' · 40ec172f
  Nick Thomas authored Feb 28, 2019
```
Use Web IDE path for merge request edit buttons

See merge request gitlab-org/gitlab-ce!25595
```
  40ec172f
- Automatic merge of gitlab-org/gitlab-ce master · d3027ada
  GitLab Bot authored Feb 28, 2019
  
  d3027ada
- Merge branch '57788-project-labels-tooltip-missing' into 'master' · 56e6dac7
  Clement Ho authored Feb 28, 2019
```
Fix bug where project topics truncate

Closes #57788

See merge request gitlab-org/gitlab-ce!25398
```
  56e6dac7
- Fix bug where project topics truncate · 983173ce
  Brandon Labuschagne authored Feb 28, 2019
  
  983173ce
- Automatic merge of gitlab-org/gitlab-ce master · cee2a47f
  GitLab Bot authored Feb 28, 2019
  
  cee2a47f
- Merge branch 'enable-perf-in-mr' into 'master' · 23eb41fc
  Rémy Coutable authored Feb 28, 2019
```
Enabling performance metrics on Review Apps

Closes #57881

See merge request gitlab-org/gitlab-ce!25549
```
  23eb41fc
- Enabling performance metrics on Review Apps · 68cafb38
  Ramya Authappan authored Feb 28, 2019
  
  68cafb38
- Revert "Quarantine GitHub OAuth test" · 377d2ada
  Sanad Liaquat authored Feb 28, 2019
```
This reverts commit 970576c5.
```
  377d2ada
- Merge branch 'apollo-package-upgrades' into 'master' · 8bc3c69e
  Filipa Lacerda authored Feb 28, 2019
```
Update apollo libraries

See merge request gitlab-org/gitlab-ce!25608
```
  8bc3c69e
- Merge branch 'tc-cleanup-admin-sidebar' into 'master' · bf03ad77
  Filipa Lacerda authored Feb 28, 2019
```
Reorganize admin views a bit

See merge request gitlab-org/gitlab-ee!9721
```
  bf03ad77
- Merge branch 'add-project-level-config-for-prospective-merge-pipelines-ce' into 'master' · 62e15207
  Filipa Lacerda authored Feb 28, 2019
```
Backport: Add project level config for merge pipelines

See merge request gitlab-org/gitlab-ce!25385
```
  62e15207
- Automatic merge of gitlab-org/gitlab-ce master · 46cccfa4
  GitLab Bot authored Feb 28, 2019
  
  46cccfa4
- Merge branch 'add-project-level-config-for-prospective-merge-pipelines' into 'master' · caa2e239
  Filipa Lacerda authored Feb 28, 2019
```
Add project level config for merge pipelines

See merge request gitlab-org/gitlab-ee!9572
```
  caa2e239
- Merge branch 'mr-origin-24925' into 'master' · 7df76020
  Sean McGivern authored Feb 28, 2019
```
Jira: make issue links title compact

See merge request gitlab-org/gitlab-ce!25609
```
  7df76020
- Jira: Make issue links title compact · 94024cd6
  Douglas Barbosa Alexandre authored Feb 28, 2019
```
Port of a community contribution from @glensc to upstream.
```
  94024cd6
- Merge branch... · 7dae2c96
  Kamil Trzciński authored Feb 28, 2019
```
Merge branch '9933-updatemaxseatsusedforgitlabcomsubscriptionsworker-attempts-to-run-on-geo-secondary' into 'master'

Guard if DB is read only

Closes #9933

See merge request gitlab-org/gitlab-ee!9703
```
  7dae2c96
- Automatic merge of gitlab-org/gitlab-ce master · 489b3a2d
  GitLab Bot authored Feb 28, 2019
  
  489b3a2d
- Merge branch 'sso-dedicated-group-accounts-flag' into 'master' · db38e6f7
  James Lopez authored Feb 28, 2019
```
Add dedicated group accounts flag & feature flag

See merge request gitlab-org/gitlab-ee!9625
```
  db38e6f7
- Merge branch '9137-notes-order' into 'master' · 9cc333b2
  Grzegorz Bizon authored Feb 28, 2019
```
Ensure notes insertion order same as draft note

Closes #9137

See merge request gitlab-org/gitlab-ee!9684
```
  9cc333b2
- Merge branch 'sh-redash-is-baaaaaack' into 'master' · f2753695
  Rémy Coutable authored Feb 28, 2019
```
Bring back mentions of Redash

See merge request gitlab-org/gitlab-ce!25618
```
  f2753695
- Automatic merge of gitlab-org/gitlab-ce master · 96962701
  GitLab Bot authored Feb 28, 2019
  
  96962701
- Merge branch '55505-mr-diff-karma-tests' into 'master' · ec2473a7
  Phil Hughes authored Feb 28, 2019
```
Resolve "Add missing karma tests to the the MR Diff components"

Closes #55505

See merge request gitlab-org/gitlab-ce!24733
```
  ec2473a7
- Resolve "Add missing karma tests to the the MR Diff components" · edfdf568
  Natalia Tepluhina authored Feb 28, 2019
  
  edfdf568
- Automatic merge of gitlab-org/gitlab-ce master · b7f27d05
  GitLab Bot authored Feb 28, 2019
  
  b7f27d05
- Merge branch 'qa-nightly-83-quarantine-oauth-specs' into 'master' · b374abec
  Ramya Authappan authored Feb 28, 2019
```
Quarantine GitHub OAuth tests

See merge request gitlab-org/gitlab-ce!25631
```
  b374abec
- Merge branch 'root_controller_gitaly_allow_n_1' into 'master' · cbdd2411
  Stan Hu authored Feb 28, 2019
```
Allow Gitaly N+1 calls for RootController#index

See merge request gitlab-org/gitlab-ce!25514
```
  cbdd2411
- Quarantine GitHub OAuth test · 970576c5
  Sanad Liaquat authored Feb 28, 2019
  
  970576c5
- Automatic merge of gitlab-org/gitlab-ce master · 85884039
  GitLab Bot authored Feb 28, 2019
  
  85884039
- Merge branch 'docs/add-efs-warning' into 'master' · b802e0bb
  Evan Read authored Feb 28, 2019
```
Docs: Add EFS warning message for AWS installs

See merge request gitlab-org/gitlab-ce!25498
```
  b802e0bb
- Docs: Add EFS warning message for AWS installs · dc4294ef
  David Coy authored Feb 28, 2019
  
  dc4294ef
- Automatic merge of gitlab-org/gitlab-ce master · f3d45e45
  GitLab Bot authored Feb 28, 2019
  
  f3d45e45
- Merge branch 'docs-tristanw-update-groups-page' into 'master' · 7f3b81d5
  Evan Read authored Feb 28, 2019
```
Docs: groups page updates

See merge request gitlab-org/gitlab-ee!9754
```
  7f3b81d5