Commits · 12af0cdcf2cd83d3d43438adc1bc097bac86282c · nexedi / gitlab-ce

23 Jul, 2018 2 commits
- Merge branch 'ce-to-ee-2018-07-20' into 'master' · 12af0cdc
  Robert Speicher authored Jul 23, 2018
```
CE upstream - 2018-07-20 21:21 UTC

See merge request gitlab-org/gitlab-ee!6619
```
  12af0cdc
- Merge branch 'ee-48932-disable-saml-if-omniauth-is-disabled' into 'master' · 71e97660
  Douwe Maan authored Jul 23, 2018
```
EE: Resolve "Disable SAML and Bitbucket if OmniAuth is disabled"

See merge request gitlab-org/gitlab-ee!6501
```
  71e97660
22 Jul, 2018 6 commits
- Merge branch 'update-groups-docs' into 'master' · 3007b0e3
  Mike Lewis authored Jul 22, 2018
```
Update Groups docs via new top nav dropdown

See merge request gitlab-org/gitlab-ee!6622
```
  3007b0e3
- Merge branch 'update-contribution-analytics-docs' into 'master' · 8c425186
  Mike Lewis authored Jul 22, 2018
```
Update Contribution Analytics docs

See merge request gitlab-org/gitlab-ee!6623
```
  8c425186
- Update index.md · 4fb173c5
  Mike Lewis authored Jul 22, 2018
  
  4fb173c5
- Update index.md · 58bd1136
  Mike Lewis authored Jul 22, 2018
  
  58bd1136
- Merge branch 'update-third-party-offers-docs' into 'master' · a57a0af6
  Mike Lewis authored Jul 22, 2018
```
Update Third party offers docs

See merge request gitlab-org/gitlab-ee!6624
```
  a57a0af6
- Update third_party_offers.md · b31c95ce
  Mike Lewis authored Jul 22, 2018
  
  b31c95ce
21 Jul, 2018 5 commits
- Update docs page via brief explanation and example · 2ecae317
  Andreas Kämmerle authored Jul 21, 2018
  
  2ecae317
- Minor text tweaks · 7057282f
  Andreas Kämmerle authored Jul 21, 2018
  
  7057282f
- Update Contribution analytics screenshot · 0e4d9c3f
  Andreas Kämmerle authored Jul 21, 2018
  
  0e4d9c3f
- Mention new Groups top nav dropdown in docs · c250276a
  Andreas Kämmerle authored Jul 21, 2018
  
  c250276a
- Update groups screenshot · c071b311
  Andreas Kämmerle authored Jul 21, 2018
  
  c071b311
20 Jul, 2018 27 commits
- Merge branch... · ab28f598
  Robert Speicher authored Jul 20, 2018
```
Merge branch '6104-extract-ee-specific-files-lines-for-some-platform-related-project-views' into 'master'

[EE] Resolve "Extract EE specific files/lines for some platform related project views"

See merge request gitlab-org/gitlab-ee!6133
```
  ab28f598
- Resolve app/views/admin/application_settings/_help_page.html.haml · 000360db
  Robert Speicher authored Jul 20, 2018
  
  000360db
- Merge branch 'sh-move-json-logger' into 'master' · 631b3ee8
  Robert Speicher authored Jul 20, 2018
```
Move JsonLogger to CE and add spec

See merge request gitlab-org/gitlab-ee!6616
```
  631b3ee8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-20 · d3612b5a
  GitLab Bot authored Jul 20, 2018
```
# Conflicts:
#	app/views/admin/application_settings/_help_page.html.haml

[ci skip]
```
  d3612b5a
- Merge branch '3871-move-ee-javascript-specs-2' into 'master' · ce19ba6a
  Mike Greiling authored Jul 20, 2018
```
Move EE only files in spec/javascripts/boards

See merge request gitlab-org/gitlab-ee!6606
```
  ce19ba6a
- Merge branch 'ce-to-ee-2018-07-20' into 'master' · 75a98f4d
  Stan Hu authored Jul 20, 2018
```
CE upstream - 2018-07-20 18:21 UTC

See merge request gitlab-org/gitlab-ee!6618
```
  75a98f4d
- Merge branch '47530-replace-label-light-with-label-bold' into 'master' · 38736175
  Clement Ho authored Jul 20, 2018
```
Resolve "Replace all usages of `label-light` with `label-bold`"

Closes #47530 and #41725

See merge request gitlab-org/gitlab-ce!20727
```
  38736175
- Merge branch 'ee-47530-replace-label-light-with-label-bold' into 'master' · b11368ca
  Clement Ho authored Jul 20, 2018
```
Replace label-light with label-bold. Because it's bold, not light

See merge request gitlab-org/gitlab-ee!6612
```
  b11368ca
- Merge branch '6963-pod-log-mobile' into 'master' · f7fca937
  Clement Ho authored Jul 20, 2018
```
Resolve "Mobile view for pod logs has an alignment issue"

Closes #6963

See merge request gitlab-org/gitlab-ee!6597
```
  f7fca937
- Resolve "Mobile view for pod logs has an alignment issue" · 268d337a
  Annabel Gray authored Jul 20, 2018
  
  268d337a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-20 · ead3d151
  GitLab Bot authored Jul 20, 2018
  
  ead3d151
- Move JsonLogger to CE and add spec · 03091781
  Stan Hu authored Jul 20, 2018
  
  03091781
- Merge branch 'ce-to-ee-2018-07-20' into 'master' · 97f71f5b
  Filipa Lacerda authored Jul 20, 2018
```
CE upstream - 2018-07-20 15:21 UTC

Closes gitaly#1106

See merge request gitlab-org/gitlab-ee!6613
```
  97f71f5b
- Merge branch '5594-geo-add-repository-verification-failures-to-api' into 'master' · 16118bef
  Douglas Barbosa Alexandre authored Jul 20, 2018
```
Resolve "Geo: Add repository verification failures to API"

Closes #5594

See merge request gitlab-org/gitlab-ee!6137
```
  16118bef
- Resolve "Geo: Add repository verification failures to API" · bf30d258
  Valery Sizov authored Jul 20, 2018
  
  bf30d258
- Merge branch '48817-fix-mr-changes-discussion-navigation' into 'master' · ced005f3
  Filipa Lacerda authored Jul 20, 2018
```
Resolve ""Jump to first/next unresolved discussion" jumps to resolved discussions"

Closes #48817 and #48602

See merge request gitlab-org/gitlab-ce!20434
```
  ced005f3
- Resolve ""Jump to first/next unresolved discussion" jumps to resolved discussions" · f2f8ddf4
  André Luís authored Jul 20, 2018
  
  f2f8ddf4
- Merge branch 'jupyter-image' into 'master' · 9b01b293
  Dmitriy Zaporozhets authored Jul 20, 2018
```
Specify Jupyter Image to use with JupyterHub Installation

See merge request gitlab-org/gitlab-ce!20714
```
  9b01b293
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-20 · 2731c9e1
  GitLab Bot authored Jul 20, 2018
  
  2731c9e1
- Better chengelog for jupyter image change · f22a7340
  Amit Rathi authored Jul 20, 2018
  
  f22a7340
- Replace label-light with label-bold. Because it's bold, not light · db704770
  Annabel Dunstone Gray authored Jul 20, 2018
  
  db704770
- Merge branch 'dennis-move-droplab-filtered-search-ee-features' into 'master' · 50a8acda
  Fatih Acet authored Jul 20, 2018
```
move EE-only droplab/filtered search features to ee/

See merge request gitlab-org/gitlab-ee!6610
```
  50a8acda
- Move EE only JS specs for spec/javascripts/boards · 9b84f923
  Lin Jen-Shin authored Jul 20, 2018
  
  9b84f923
- Merge branch 'change-discussion-label-to-plan-label' into 'master' · d15309ca
  Sean McGivern authored Jul 20, 2018
```
Change Discussion label to Plan label and add Create label

See merge request gitlab-org/gitlab-ce!20717
```
  d15309ca
- Change Discussion label to Plan label and add Create label · c62d542b
  Victor Wu authored Jul 20, 2018
  
  c62d542b
- Merge branch '45443-unable-to-save-user-profile-update-with-safari' into 'master' · 37067071
  Filipa Lacerda authored Jul 20, 2018
```
Resolve "Unable to save user profile update with Safari"

Closes #45443

See merge request gitlab-org/gitlab-ce!20676
```
  37067071
- Merge branch 'docs/fix-indent-problem-in-mysql_to_postgresql' into 'master' · 623efcef
  Stan Hu authored Jul 20, 2018
```
Docs: Fix indent problem in mysql_to_postgresql.md

See merge request gitlab-org/gitlab-ce!20736
```
  623efcef