Commits · adbf8b8a58c329b786e502908cfe49ae2e161f98 · nexedi / gitlab-ce

13 Apr, 2018 14 commits
- In EE, com? also checks for subdomains, which includes staging · adbf8b8a
  Lin Jen-Shin authored Apr 13, 2018
  
  adbf8b8a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-13 · b1559330
  GitLab Bot authored Apr 13, 2018
  
  b1559330
- Merge branch 'ide-firefox-scroll-fix' into 'master' · ab98308d
  Filipa Lacerda authored Apr 13, 2018
```
Fixed IDE sidebar not being scrollable in FireFox

Closes #45314

See merge request gitlab-org/gitlab-ce!18350
```
  ab98308d
- Merge branch 'changes-bar-peek-id-change' into 'master' · 59707ade
  Filipa Lacerda authored Apr 13, 2018
```
Changes the ID for the performance bar to correctly sticky the stat bar to the top

See merge request gitlab-org/gitlab-ce!18359
```
  59707ade
- Merge branch 'ce-to-ee-2018-04-12' into 'master' · 70e7f7b6
  Lin Jen-Shin authored Apr 13, 2018
```
CE upstream - 2018-04-12 21:23 UTC

See merge request gitlab-org/gitlab-ee!5349
```
  70e7f7b6
- Merge branch 'contribute/no-rm-rf-gitlab-basics' into 'master' · 791bc18a
  Achilleas Pipinellis authored Apr 13, 2018
```
Don't use "-f" with "rm" in Gitlab-Basics Docs

Closes #20071

See merge request gitlab-org/gitlab-ce!18027
```
  791bc18a
- Merge branch 'zj-storage-path-deprecation' into 'master' · ac149be0
  Douwe Maan authored Apr 13, 2018
```
Deprecate legacy disk paths

See merge request gitlab-org/gitlab-ce!18332
```
  ac149be0
- Merge branch 'feature/add-language-in-repository-to-api' into 'master' · a45729c8
  Douwe Maan authored Apr 13, 2018
```
Feature/add language in repository to api

See merge request gitlab-org/gitlab-ce!17770
```
  a45729c8
- Feature/add language in repository to api · e467a11e
  Roger Rüttimann authored Apr 13, 2018
  
  e467a11e
- Merge branch 'docs-for-failure-reason-tooltip' into 'master' · 70083ebf
  Achilleas Pipinellis authored Apr 13, 2018
```
Add missing documentation about failure reason

Closes #45300

See merge request gitlab-org/gitlab-ce!18352
```
  70083ebf
- Add missing documentation about failure reason · 3bd5d531
  Mayra Cabrera authored Apr 13, 2018
  
  3bd5d531
- Merge branch 'jprovazn-fix-references' into 'master' · 46302c8c
  Douwe Maan authored Apr 13, 2018
```
Fix reference filters in group context

See merge request gitlab-org/gitlab-ce!18340
```
  46302c8c
- Merge branch 'ee-jprovazn-fix-references' into 'master' · 573115d9
  Douwe Maan authored Apr 13, 2018
```
[EE] Fix reference filters in group context

Closes #5631

See merge request gitlab-org/gitlab-ee!5339
```
  573115d9
- Changes the ID for the performance bar to correctly sticky the stat bar to the top · cae8bd37
  Phil Hughes authored Apr 13, 2018
  
  cae8bd37
12 Apr, 2018 26 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-12 · 274238ed
  GitLab Bot authored Apr 12, 2018
  
  274238ed
- Merge branch '30739-fix-joined-information-on-project-members-page' into 'master' · 4758db5a
  Clement Ho authored Apr 12, 2018
```
Resolve "Weird "joined" information on project members page"

Closes #30739

See merge request gitlab-org/gitlab-ce!18290
```
  4758db5a
- Merge branch 'ce-to-ee-2018-04-12' into 'master' · 95ac1154
  Robert Speicher authored Apr 12, 2018
```
CE upstream - 2018-04-12 18:23 UTC

Closes #5103

See merge request gitlab-org/gitlab-ee!5347
```
  95ac1154
- Merge branch 'docs/autodevops-buildpacks' into 'master' · 3354523d
  Achilleas Pipinellis authored Apr 12, 2018
```
Correct wrong buildpacks filename

See merge request gitlab-org/gitlab-ce!18336
```
  3354523d
- Resolve conflicts in `spec/policies/project_policy_spec.rb` · 1e5829c1
  Bob Van Landuyt authored Apr 12, 2018
  
  1e5829c1
- Resolve conflicts in `app/views/admin/projects/show.html.haml` · 7e1943e2
  Bob Van Landuyt authored Apr 12, 2018
  
  7e1943e2
- Fix conflicts in `app/policies/project_policy.rb` · e6fd6de1
  Bob Van Landuyt authored Apr 12, 2018
  
  e6fd6de1
- Fix conflict in `app/controllers/projects/issues_controller.rb` · c4280a1a
  Bob Van Landuyt authored Apr 12, 2018
  
  c4280a1a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-12 · 381a636c
  GitLab Bot authored Apr 12, 2018
```
# Conflicts:
#	app/controllers/projects/issues_controller.rb
#	app/policies/project_policy.rb
#	app/views/admin/projects/show.html.haml
#	spec/policies/project_policy_spec.rb

[ci skip]
```
  381a636c
- Merge branch 'rename-overview-project-sidenav' into 'master' · 7f01d49b
  Tim Zallmann authored Apr 12, 2018
```
Renamed 'Overview' to 'Project' in the contextual navigation at a project level

Closes #43430

See merge request gitlab-org/gitlab-ce!18295
```
  7f01d49b
- Renamed 'Overview' to 'Project' in the contextual navigation at a project level · 406915f4
  Constance Okoghenun authored Apr 12, 2018
  
  406915f4
- Merge branch 'docs-graphs-section-new-frontend-guide' into 'master' · da693388
  Clement Ho authored Apr 12, 2018
```
Update the new frontend guide to specify the usage of d3

See merge request gitlab-org/gitlab-ce!18294
```
  da693388
- Merge branch '10-7-update-licenses' into 'master' · a76dacd9
  Rémy Coutable authored Apr 12, 2018
```
Update the dependencies license list for 10.7

See merge request gitlab-org/gitlab-ce!18339
```
  a76dacd9
- Update the dependencies license list for 10.7 · e817399d
  Filipa Lacerda authored Apr 12, 2018
  
  e817399d
- Added d3 documentation for the new fe guide · e3eeb3cb
  Jose Ivan Vargas authored Apr 10, 2018
  
  e3eeb3cb
- Merge branch 'dm-archived-read-only' into 'master' · f5a3d8f7
  Robert Speicher authored Apr 12, 2018
```
Make archived projects completely read-only

Closes #44788

See merge request gitlab-org/gitlab-ce!18136
```
  f5a3d8f7
- Merge branch 'ce-to-ee-2018-04-12' into 'master' · 200764bc
  Rémy Coutable authored Apr 12, 2018
```
CE upstream - 2018-04-12 09:32 UTC

See merge request gitlab-org/gitlab-ee!5338
```
  200764bc
- Merge branch 'dm-archived-read-only-ee' into 'master' · befdcac3
  Robert Speicher authored Apr 12, 2018
```
[EE] Make archived projects completely read-only

See merge request gitlab-org/gitlab-ee!5227
```
  befdcac3
- Merge branch 'revert-93869c63' into 'master' · 64f91be0
  Filipa Lacerda authored Apr 12, 2018
```
Revert "Resolve HTML/CSS inconsistent comment forms on Issue and Merge Request"

Closes #45288

See merge request gitlab-org/gitlab-ce!18346
```
  64f91be0
- Fixed IDE sidebar not being scrollable in FireFox · 5a84020f
  Phil Hughes authored Apr 12, 2018
```
Closes #45314
```
  5a84020f
- Spec improvements for speed, reliability and readability · 08a6a45c
  Bob Van Landuyt authored Apr 11, 2018
  
  08a6a45c
- Spec improvements for speed, reliability and readability · eae2ed33
  Bob Van Landuyt authored Apr 11, 2018
  
  eae2ed33
- Resolve conflict in doc/topics/autodevops/index.md · 0b90a0f9
  Rémy Coutable authored Apr 12, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0b90a0f9
- Resolve conflict in spec/lib/gitlab/utils_spec.rb · e50886bb
  Rémy Coutable authored Apr 12, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e50886bb
- Resolve conflict in lib/gitlab/utils.rb · 98dfb9f8
  Rémy Coutable authored Apr 12, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  98dfb9f8
- Merge branch '42613-clean-up-old-project-permissions-frontend-code' into 'master' · da6595d4
  Clement Ho authored Apr 12, 2018
```
Resolve "Clean up old project permissions frontend code"

Closes #42613

See merge request gitlab-org/gitlab-ce!16818
```
  da6595d4