Commits · a9374a51910be409194707e8382dc7e7a2216106 · nexedi / gitlab-ce

19 Mar, 2018 1 commit
- 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 2 commits
- 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 30 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
- Fixed profile notifications not being editable · 1c74f559
  Phil Hughes authored Mar 16, 2018
```
Closes #44198
```
  1c74f559
- Rename manual job to `package-and-qa` · f2cc309f
  Toon Claes authored Mar 16, 2018
```
To make it more clear it's building the package **and** doing QA, rename the job.
```
  f2cc309f
- Merge branch 'gems/sm/bump-fog-google-to-make-lfs-work-ee' into 'master' · 695b95c0
  Kamil Trzciński authored Mar 16, 2018
```
Bump fog-google to 1.3.3

Closes #5249

See merge request gitlab-org/gitlab-ee!4999
```
  695b95c0
- Resolve conflicts · bdc48836
  Robert Speicher authored Mar 16, 2018
  
  bdc48836
- Merge branch 'gitaly-0.91.0' into 'master' · 78fb81e6
  Robert Speicher authored Mar 16, 2018
```
Use Gitaly 0.91.0

See merge request gitlab-org/gitlab-ce!17802
```
  78fb81e6
- Merge branch 'update_vendored_gitlab_ci_yml' into 'master' · 4b1f2113
  Robert Speicher authored Mar 16, 2018
```
Update vendored gitlab-ci.yml template for auto-devops

See merge request gitlab-org/gitlab-ce!17804
```
  4b1f2113
- Merge branch... · 5fb20651
  Grzegorz Bizon authored Mar 16, 2018
```
Merge branch '41902-add-api-option-to-overwrite-project-description-on-project-export' into 'master'

Resolve "Extend API for exporting a project with option to overwrite project description"

Closes #41902 and #34936

See merge request gitlab-org/gitlab-ce!17744
```
  5fb20651
- Merge branch '44126-setup-middleware-before-adapter' into 'master' · 30476e39
  Kamil Trzciński authored Mar 16, 2018
```
Eliminate Faraday warnings

Closes #44126

See merge request gitlab-org/gitlab-ce!17795
```
  30476e39
- Merge branch 'ide-diff-view' into 'master' · 97c7c8ec
  Tim Zallmann authored Mar 16, 2018
```
IDE open changed files in diff viewer

Closes #4568

See merge request gitlab-org/gitlab-ee!4789
```
  97c7c8ec
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-16 · f295d4d7
  GitLab Bot authored Mar 16, 2018
```
# Conflicts:
#	doc/ci/examples/code_climate.md
#	lib/gitlab/database.rb
#	spec/lib/gitlab/database_spec.rb

[ci skip]
```
  f295d4d7
- Merge branch 'jej/commit-api-tracks-lfs' into 'master' · 0b849e8d
  Dmitriy Zaporozhets authored Mar 16, 2018
```
Create commit API and Web IDE obey LFS filters

Closes #42287

See merge request gitlab-org/gitlab-ce!16718
```
  0b849e8d
- Update vendored gitlab-ci.yml template for auto-devops · 88da76a5
  Olivier Gonzalez authored Mar 16, 2018
  
  88da76a5
- Merge branch 'docs-refactor-dev-guides' into 'master' · 40e9e440
  Achilleas Pipinellis authored Mar 16, 2018
```
Docs: refactor doc general guidelines and style guidelines

Closes #41281

See merge request gitlab-org/gitlab-ce!17378
```
  40e9e440