Commits · 113de9c3002f621f6a19c5958f01a02b70fa4c11 · nexedi / gitlab-ce

20 Mar, 2019 40 commits
- Merge branch '6571-single-codebase' into 'master' · 113de9c3
  Rémy Coutable authored Mar 20, 2019
```
Extract EE specific files/lines for spec/features/issues_spec.rb

Closes #6571

See merge request gitlab-org/gitlab-ee!10306
```
  113de9c3
- Automatic merge of gitlab-org/gitlab-ce master · 48f7cdd9
  GitLab Bot authored Mar 20, 2019
  
  48f7cdd9
- Merge branch '58883-fix-fetching-comments' into 'master' · 4ac99465
  Fatih Acet authored Mar 20, 2019
```
Initialize discussionFilter after notesApp

Closes #58883

See merge request gitlab-org/gitlab-ce!26092
```
  4ac99465
- Merge branch 'design-management-upload-component' into 'master' · 93a77b70
  Filipa Lacerda authored Mar 20, 2019
```
Created upload designs component

See merge request gitlab-org/gitlab-ee!10017
```
  93a77b70
- Automatic merge of gitlab-org/gitlab-ce master · dfa9e89e
  GitLab Bot authored Mar 20, 2019
  
  dfa9e89e
- Merge branch '10533-blank-css' into 'master' · dfd09753
  Phil Hughes authored Mar 20, 2019
```
Removes EE differences for blank.scss

Closes gitlab-ee#10533

See merge request gitlab-org/gitlab-ce!26354
```
  dfd09753
- Merge branch 'ee-10533-blank-css' into 'master' · 4c8d6d9a
  Phil Hughes authored Mar 20, 2019
```
EE: Removes EE differences for blank.scss

See merge request gitlab-org/gitlab-ee!10311
```
  4c8d6d9a
- Merge branch '10532-common-css' into 'master' · fd037945
  Phil Hughes authored Mar 20, 2019
```
Removes EE differences from common.scss

Closes gitlab-ee#10532

See merge request gitlab-org/gitlab-ce!26352
```
  fd037945
- Merge branch '9288-create-a-scim-specific-token-for-group-sso-be' into 'master' · 380ee132
  Grzegorz Bizon authored Mar 20, 2019
```
Resolve "Create a SCIM specific token for group SSO [BE]"

Closes #9288

See merge request gitlab-org/gitlab-ee!9786
```
  380ee132
- Automatic merge of gitlab-org/gitlab-ce master · 92ec08df
  GitLab Bot authored Mar 20, 2019
  
  92ec08df
- Merge branch... · e61cbe7f
  Robert Speicher authored Mar 20, 2019
```
Merge branch 'ee-6516-extract-ee-specific-files-lines-for-spec-models-project_services' into 'master'

Tweak kubernetes_service_spec for EE compatibility

Closes gitlab-ee#6516

See merge request gitlab-org/gitlab-ce!26155
```
  e61cbe7f
- Automatic merge of gitlab-org/gitlab-ce master · e635184d
  GitLab Bot authored Mar 20, 2019
  
  e635184d
- Merge branch '10520-builds-css' into 'master' · 65bbfd5a
  Phil Hughes authored Mar 20, 2019
```
Removes EE differences for builds.css

Closes gitlab-ee#10520

See merge request gitlab-org/gitlab-ce!26351
```
  65bbfd5a
- Merge branch 'ee-10520-builds-css' into 'master' · f03eedb0
  Phil Hughes authored Mar 20, 2019
```
EE: Removes EE differences for builds.css

See merge request gitlab-org/gitlab-ee!10310
```
  f03eedb0
- Merge branch '10517-pipelines-css' into 'master' · 21efc1a2
  Phil Hughes authored Mar 20, 2019
```
Removes EE differences for pipelines.scss

Closes gitlab-ee#10517

See merge request gitlab-org/gitlab-ce!26350
```
  21efc1a2
- Merge branch 'ee-10516-env-css' into 'master' · 1674752f
  Phil Hughes authored Mar 20, 2019
```
Moves EE specific env CSS into EE folder

Closes #10516

See merge request gitlab-org/gitlab-ee!10307
```
  1674752f
- Automatic merge of gitlab-org/gitlab-ce master · c90503fb
  GitLab Bot authored Mar 20, 2019
  
  c90503fb
- Merge branch 'force-notification-to-saml-email-ee' into 'master' · 5e68bd3d
  James Lopez authored Mar 20, 2019
```
Force notifications to SAML email address for dedicated users

See merge request gitlab-org/gitlab-ee!9712
```
  5e68bd3d
- Force notifications to SAML email address for dedicated users · 1b3c1857
  Gosia Ksionek authored Mar 20, 2019
  
  1b3c1857
- Merge branch 'force-notification-to-saml-email' into 'master' · d8e27949
  James Lopez authored Mar 20, 2019
```
CE backport of forcing sending notifications to saml provided email

See merge request gitlab-org/gitlab-ce!25739
```
  d8e27949
- CE backport of forcing sending notifications to saml provided email · 2bcfb239
  Gosia Ksionek authored Mar 20, 2019
  
  2bcfb239
- Move EE-specific tests to separate file · 4732b271
  Heinrich Lee Yu authored Mar 20, 2019
```
Extracts tests related to issue weight into a separate file
```
  4732b271
- Created upload designs component · 89be6c60
  Phil Hughes authored Mar 20, 2019
  
  89be6c60
- Merge branch '6516-extract-ee-specific-files-lines-for-spec-models-project_services' into 'master' · 86892ebc
  Robert Speicher authored Mar 20, 2019
```
Extract EE specific files/lines for spec/models/project_services

See merge request gitlab-org/gitlab-ee!10023
```
  86892ebc
- Removes EE differences for blank.scss · 71b09cc3
  Filipa Lacerda authored Mar 20, 2019
  
  71b09cc3
- Merge branch 'ee-move-clusters-sidebar-file' into 'master' · 9893e227
  Phil Hughes authored Mar 20, 2019
```
Moves multiple clusters EE file

See merge request gitlab-org/gitlab-ee!10279
```
  9893e227
- Removes EE differences for blank.scss · 6b195fd0
  Filipa Lacerda authored Mar 20, 2019
  
  6b195fd0
- Removes EE differences from common.scss · 108792e4
  Filipa Lacerda authored Mar 20, 2019
  
  108792e4
- Removes EE differences for builds.css · 14168727
  Filipa Lacerda authored Mar 20, 2019
  
  14168727
- Removes EE differences for builds.css · 23c43b95
  Filipa Lacerda authored Mar 20, 2019
  
  23c43b95
- Removes EE differences for pipelines.scss · 02d0b50b
  Filipa Lacerda authored Mar 20, 2019
  
  02d0b50b
- Automatic merge of gitlab-org/gitlab-ce master · f4a50318
  GitLab Bot authored Mar 20, 2019
  
  f4a50318
- Merge branch '58410-change-pixel-size-of-instance-header-footer-message-to-16px' into 'master' · 1614089f
  Filipa Lacerda authored Mar 20, 2019
```
Reduce height of instance system message

Closes #58410

See merge request gitlab-org/gitlab-ce!25752
```
  1614089f
- Moves EE specific env CSS into EE folder · 88641993
  Filipa Lacerda authored Mar 20, 2019
  
  88641993
- Merge branch 'winh-dequarantine-labels-autocomplete' into 'master' · 5dc56f83
  Kushal Pandya authored Mar 20, 2019
```
Move gfm_autocomplete_spec.rb out of quarantine

Closes #57995 and #56843

See merge request gitlab-org/gitlab-ce!25958
```
  5dc56f83
- Merge branch 'winh-dequarantine-labels-autocomplete-ee' into 'master' · ab1371f7
  Kushal Pandya authored Mar 20, 2019
```
Move gfm_autocomplete_spec.rb out of quarantine (EE-port)

Closes gitlab-ce#57995 and gitlab-ce#56843

See merge request gitlab-org/gitlab-ee!9955
```
  ab1371f7
- Automatic merge of gitlab-org/gitlab-ce master · ba47c0da
  GitLab Bot authored Mar 20, 2019
  
  ba47c0da
- Merge branch 'do-not-force-2fa-ee' into 'master' · 8e27f826
  James Lopez authored Mar 20, 2019
```
CE backport: Add additional link to 2fa page

See merge request gitlab-org/gitlab-ee!9877
```
  8e27f826
- CE backport: Add additional link to 2fa page · 3e401e5b
  Gosia Ksionek authored Mar 20, 2019
  
  3e401e5b
- Merge branch 'do-not-force-2fa' into 'master' · 00e5d66d
  James Lopez authored Mar 20, 2019
```
Add additional link to 2fa page

See merge request gitlab-org/gitlab-ce!25731
```
  00e5d66d