Commits · 51aff7ab9b86e59202bff7add340e95505398fd5 · nexedi / gitlab-ce

19 Mar, 2018 13 commits
- Merge branch 'bvl-ext-auth-docs' into 'master' · 51aff7ab
  Achilleas Pipinellis authored Mar 19, 2018
```
Add documentation for external authorization

See merge request gitlab-org/gitlab-ee!4977
```
  51aff7ab
- Refactor the external authorization settings · f42c61d7
  Achilleas Pipinellis authored Mar 19, 2018
  
  f42c61d7
- Merge branch 'ce-to-ee-2018-03-19' into 'master' · 97a2686c
  Lin Jen-Shin authored Mar 19, 2018
```
CE upstream - 2018-03-19 09:25 UTC

Closes gitlab-runner#3095

See merge request gitlab-org/gitlab-ee!5015
```
  97a2686c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-19 · f3b65baf
  GitLab Bot authored Mar 19, 2018
  
  f3b65baf
- Merge branch 'tc-package-qa-rename-docs' into 'master' · d0eee137
  Grzegorz Bizon authored Mar 19, 2018
```
Rename `package-qa` in docs

See merge request gitlab-org/gitlab-ce!17842
```
  d0eee137
- Rename `package-qa` in docs · 88dffa45
  Toon Claes authored Mar 19, 2018
```
In gitlab-org/gitlab-ce!17807 the `package-qa` job was renamed to
`package-and-qa`. But it was not renamed in the docs. So this change
fixes that.
```
  88dffa45
- Merge branch 'update-gitlab-ci-yml-services-docs' into 'master' · 57c5cb56
  Achilleas Pipinellis authored Mar 19, 2018
```
Update CI services documnetation

Closes gitlab-runner#3095

See merge request gitlab-org/gitlab-ce!17749
```
  57c5cb56
- Copyedit CI services docs · c7a55170
  Achilleas Pipinellis authored Mar 19, 2018
  
  c7a55170
- Merge branch 'ce-to-ee-2018-03-19' into 'master' · 85f62c68
  Lin Jen-Shin authored Mar 19, 2018
```
CE upstream - 2018-03-19 06:23 UTC

See merge request gitlab-org/gitlab-ee!5013
```
  85f62c68
- Merge branch 'update-kubeclient' into 'master' · 6cfea81e
  Grzegorz Bizon authored Mar 19, 2018
```
Update kubeclient 2.2.0 -> 3.0

Closes #43911

See merge request gitlab-org/gitlab-ce!17739
```
  6cfea81e
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-19 · 05e2241a
  GitLab Bot authored Mar 19, 2018
  
  05e2241a
- Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' into 'master' · 4773111e
  Mike Greiling authored Mar 19, 2018
```
Move UnresolvedDiscussions vue component

See merge request gitlab-org/gitlab-ce!17538
```
  4773111e
- Merge branch 'ce-to-ee-2018-03-18' into 'master' · a9374a51
  Stan Hu authored Mar 19, 2018
```
CE upstream - 2018-03-18 21:28 UTC

See merge request gitlab-org/gitlab-ee!5010
```
  a9374a51
18 Mar, 2018 7 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-18 · 270562ba
  GitLab Bot authored Mar 18, 2018
  
  270562ba
- Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication-ee' into 'master' · fbfc6c0b
  Kamil Trzciński authored Mar 18, 2018
```
Port to EE: Clarify ambiguous with_artifacts implication

See merge request gitlab-org/gitlab-ee!4945
```
  fbfc6c0b
- Merge branch 'fix/sm/clarify-ambiguous-with_artifacts-implication' into 'master' · 5778de67
  Kamil Trzciński authored Mar 18, 2018
```
Clarify ambiguous with_artifacts implication

Closes #44138

See merge request gitlab-org/gitlab-ce!17720
```
  5778de67
- Merge branch 'ce-to-ee-2018-03-18' into 'master' · e0f1dc53
  James Lopez authored Mar 18, 2018
```
CE upstream - 2018-03-18 15:29 UTC

See merge request gitlab-org/gitlab-ee!5009
```
  e0f1dc53
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-18 · edc75ef7
  GitLab Bot authored Mar 18, 2018
  
  edc75ef7
- Merge branch 'fix-dropzone-project-show' into 'master' · 0b62f58b
  Jacob Schatz authored Mar 18, 2018
```
Fix dropzone project show

Closes #44137

See merge request gitlab-org/gitlab-ce!17784
```
  0b62f58b
- Fix dropzone project show · 78a8a79b
  Clement Ho authored Mar 18, 2018
  
  78a8a79b
17 Mar, 2018 3 commits
- Merge branch 'master' into 'update-kubeclient' · 83874edb
  Grzegorz Bizon authored Mar 17, 2018
```
 Conflicts:
   Gemfile.lock
```
  83874edb
- Merge branch 'ce-to-ee-2018-03-17' into 'master' · 0c8c4636
  Stan Hu authored Mar 17, 2018
```
CE upstream - 2018-03-17 00:26 UTC

See merge request gitlab-org/gitlab-ee!5005
```
  0c8c4636
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-17 · 0d28c5c1
  GitLab Bot authored Mar 17, 2018
  
  0d28c5c1
16 Mar, 2018 17 commits
- Merge branch 'ce-to-ee-2018-03-16' into 'master' · 771cc617
  Robert Speicher authored Mar 16, 2018
```
CE upstream - 2018-03-16 21:24 UTC

See merge request gitlab-org/gitlab-ee!5004
```
  771cc617
- Merge branch 'sh-fix-module-reloading' into 'master' · ea5221ae
  Robert Speicher authored Mar 16, 2018
```
Fix "A copy of Gitlab::Metrics::Methods" have been removed error

Closes #44365

See merge request gitlab-org/gitlab-ce!17810
```
  ea5221ae
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-16 · de13c3a5
  GitLab Bot authored Mar 16, 2018
  
  de13c3a5
- Merge branch 'acet-notes-prettified' into 'master' · 88bd9bac
  Mike Greiling authored Mar 16, 2018
```
Prettify notes app

See merge request gitlab-org/gitlab-ce!17812
```
  88bd9bac
- Merge branch 'profile-notifications-dropdown-fix' into 'master' · bcc04515
  Filipa Lacerda authored Mar 16, 2018
```
Fixed profile notifications not being editable

Closes #44198

See merge request gitlab-org/gitlab-ce!17808
```
  bcc04515
- Merge branch '39521-fix-merge-request-discussion-timestamp-overflow' into 'master' · f46ae65b
  Fatih Acet authored Mar 16, 2018
```
Resolve "Right column of merge request discussion overflows"

Closes #39521

See merge request gitlab-org/gitlab-ce!17550
```
  f46ae65b
- Prettify notes. · fdc9ae2e
  Fatih Acet authored Mar 16, 2018
  
  fdc9ae2e
- Merge branch 'ce-to-ee-2018-03-16' into 'master' · e58fce3f
  Robert Speicher authored Mar 16, 2018
```
CE upstream - 2018-03-16 15:27 UTC

See merge request gitlab-org/gitlab-ee!5002
```
  e58fce3f
- Fix "A copy of Gitlab::Metrics::Methods" have been removed error · 02d2a789
  Stan Hu authored Mar 16, 2018
```
Closes #44365
```
  02d2a789
- Merge branch '4592-go-back-option-ide' into 'master' · 05e5621d
  Phil Hughes authored Mar 16, 2018
```
Add a Go back option to Web IDE

Closes #4592

See merge request gitlab-org/gitlab-ee!4969
```
  05e5621d
- Merge branch 'ab-5271-fix-ee-files-location-check' into 'master' · a7234294
  Robert Speicher authored Mar 16, 2018
```
Choose shortest match for CE branch in ee-files-location-check.

Closes #5271

See merge request gitlab-org/gitlab-ee!4968
```
  a7234294
- Merge branch 'sh-optimize-admin-projects-page' into 'master' · 2c792c75
  Robert Speicher authored Mar 16, 2018
```
Fix timeouts loading /admin/projects page

Closes #44338

See merge request gitlab-org/gitlab-ce!17785
```
  2c792c75
- Add Go Back link to WebIDE · fa42efde
  André Luís authored Mar 02, 2018
  
  fa42efde
- Merge branch 'toon-master-patch-57286' into 'master' · 9fd2d9ea
  Marin Jankovski authored Mar 16, 2018
```
Rename manual job to `package-and-qa`

See merge request gitlab-org/gitlab-ce!17807
```
  9fd2d9ea
- Merge branch 'opnshift-docs-patch' into 'master' · f864fb46
  Marcia Ramos authored Mar 16, 2018
```
OpenShift install docs: Recommend "add-scc-to-user" over "edit scc"

See merge request gitlab-org/gitlab-ce!17787
```
  f864fb46
- Merge branch 'jramsay-43804-jupyter-docs' into 'master' · 07a06baa
  Marcia Ramos authored Mar 16, 2018
```
Add Jupyter Notebook docs

Closes #43804

See merge request gitlab-org/gitlab-ce!17495
```
  07a06baa
- Add Jupyter Notebook docs · d29f148e
  James Ramsay authored Mar 16, 2018
  
  d29f148e