Commits · 09d4b2b10d2f056d4f910919900b47001a1db7ef · nexedi / gitlab-ce

01 May, 2018 2 commits
- Fix merge conflict in Gemfile.lock · 09d4b2b1
  Jacob Vosmaer authored May 01, 2018
  
  09d4b2b1
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-01 · a48184a7
  GitLab Bot authored May 01, 2018
```
# Conflicts:
#	Gemfile.lock
#	doc/README.md
#	doc/development/README.md

[ci skip]
```
  a48184a7
30 Apr, 2018 38 commits
- Merge branch 'revert-discussion-counter-height' into 'master' · 8b3db0d6
  Filipa Lacerda authored Apr 30, 2018
```
Revert discussion counter height

Closes #45896

See merge request gitlab-org/gitlab-ce!18656
```
  8b3db0d6
- Merge branch 'ce-to-ee-2018-04-30' into 'master' · a2e85860
  Robert Speicher authored Apr 30, 2018
```
CE upstream - 2018-04-30 09:25 UTC

See merge request gitlab-org/gitlab-ee!5519
```
  a2e85860
- Revert discussion counter height · 4c5829d7
  George Tsiolis authored Apr 30, 2018
  
  4c5829d7
- Merge branch 'fix-inconsistent-protected-branch-pill-baseline' into 'master' · c34061db
  Filipa Lacerda authored Apr 30, 2018
```
Fixed inconsistent protected branch pill baseline

Closes #41286 and #45354

See merge request gitlab-org/gitlab-ce!18409
```
  c34061db
- Fixed inconsistent protected branch pill baseline · 84141298
  Constance Okoghenun authored Apr 30, 2018
  
  84141298
- Resolve conflicts · 3c72a0a5
  Robert Speicher authored Apr 30, 2018
  
  3c72a0a5
- Merge branch '10-7-security_issue_42029' into 'security-10-7' · 2f7b71df
  Phil Hughes authored Apr 18, 2018
```
Sanitize user name to avoid XSS attacks

See merge request gitlab/gitlabhq!2373
```
  2f7b71df
- Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7' · 9cf4e473
  Douwe Maan authored Apr 25, 2018
```
Serve archive requests with the correct file in all cases (10.7)

See merge request gitlab/gitlabhq!2376
```
  9cf4e473
- Merge branch 'bvl-fix-openid-redirect' into 'master' · e71351d4
  Douwe Maan authored Apr 30, 2018
```
Skip `authenticate_user!` for Doorkeeper controllers

Closes #44639

See merge request gitlab-org/gitlab-ce!18599
```
  e71351d4
- Merge branch 'rebase-in-progress-fast-timeout' into 'master' · 5af7fd59
  Douwe Maan authored Apr 30, 2018
```
Use fast timeouts for Gitaly FooInProgress RPC's

See merge request gitlab-org/gitlab-ce!18655
```
  5af7fd59
- Merge branch '43614-osw-diff-docs-ee' into 'master' · 91046f85
  Douwe Maan authored Apr 30, 2018
```
Avoid conflicts with gitlab-ce!18269

See merge request gitlab-org/gitlab-ee!5456
```
  91046f85
- Merge branch '43614-osw-diff-docs' into 'master' · 7275c225
  Douwe Maan authored Apr 30, 2018
```
Add developer documentation on diff handling and limits

Closes #43614

See merge request gitlab-org/gitlab-ce!18269
```
  7275c225
- Merge branch 'grpc-1.11.0' into 'master' · 16e848c1
  Stan Hu authored Apr 30, 2018
```
Use grpc 1.11.0

See merge request gitlab-org/gitlab-ce!18652
```
  16e848c1
- Merge branch 'ee-grpc-1.11.0' into 'master' · 2184c6ed
  Stan Hu authored Apr 30, 2018
```
Use grpc 1.11.0 (EE version)

See merge request gitlab-org/gitlab-ee!5520
```
  2184c6ed
- Merge branch 'ce-jej/branch-unprotection-disable-ui' into 'master' · d9ccc3af
  Grzegorz Bizon | OOO until May 7th authored Apr 30, 2018
```
Backports EE changes from disabling branch unprotect UI

See merge request gitlab-org/gitlab-ce!18262
```
  d9ccc3af
- Merge branch 'jej/branch-unprotection-disable-ui' into 'master' · 2b8261c0
  Grzegorz Bizon | OOO until May 7th authored Apr 30, 2018
```
Branch unprotection restrictions disable UI

See merge request gitlab-org/gitlab-ee!5296
```
  2b8261c0
- Add developer documentation on diff handling and limits · a6b56112
  Oswaldo Ferreira authored Apr 09, 2018
  
  a6b56112
- Add developer documentation on diff handling and limits · 5e0a2db7
  Oswaldo Ferreira authored Apr 09, 2018
  
  5e0a2db7
- Use grpc 1.11.0 · 5b73d0db
  Jacob Vosmaer authored Apr 30, 2018
  
  5b73d0db
- Use fast timeouts for Gitaly FooInProgress RPC's · b37cea6e
  Jacob Vosmaer authored Apr 30, 2018
  
  b37cea6e
- Merge branch '45481-sane-pages-artifacts' into 'master' · 9267ef0b
  Kamil Trzciński authored Apr 30, 2018
```
Don't automatically remove artifacts for pages jobs after pages:deploy has run

Closes #45481

See merge request gitlab-org/gitlab-ce!18628
```
  9267ef0b
- Merge branch 'pages-0-9-1' into 'master' · 1ec0556c
  Kamil Trzciński authored Apr 30, 2018
```
Use GitLab Pages v0.9.1

Closes #45639

See merge request gitlab-org/gitlab-ce!18654
```
  1ec0556c
- Merge branch 'fix-namespaceless-project-destroy-worker-specs' into 'master' · d632e616
  Douwe Maan authored Apr 30, 2018
```
Makes namespaceless project destroy worker spec not depend on a specific migration version

See merge request gitlab-org/gitlab-ce!18650
```
  d632e616
- Use GitLab Pages v0.9.1 · f1d98c2c
  Nick Thomas authored Apr 30, 2018
  
  f1d98c2c
- Merge branch 'docs-review-home' into 'master' · cd06a88d
  Achilleas Pipinellis authored Apr 30, 2018
```
Docs: review product categories in doc/README

Closes #45496

See merge request gitlab-org/gitlab-ce!18517
```
  cd06a88d
- Docs: review product categories in doc/README · 81dd85b2
  Marcia Ramos authored Apr 30, 2018
  
  81dd85b2
- Merge branch 'docs-review-home-ee' into 'master' · 06ada8c0
  Achilleas Pipinellis authored Apr 30, 2018
```
Docs: review product categories in doc/README

See merge request gitlab-org/gitlab-ee!5443
```
  06ada8c0
- Docs: review product categories in doc/README · aa329e3a
  Marcia Ramos authored Apr 30, 2018
  
  aa329e3a
- Merge branch 'zj-remove-repo-path-remote-repository' into 'master' · 660a9028
  Douwe Maan authored Apr 30, 2018
```
Remove legacy storage path call

See merge request gitlab-org/gitlab-ce!18598
```
  660a9028
- Define custom base controller for Doorkeeper · 0f593b1c
  Bob Van Landuyt authored Apr 26, 2018
```
Since we only need the `can?` view helpers there, it's better to
include those in a separate controller.

If we inherit from `ApplicationController` we also need to deal with
authentication, that needs to be done in some, but not all doorkeeper controllers.
```
  0f593b1c
- Use grpc 1.11.0 · 1bfaf102
  Jacob Vosmaer authored Apr 30, 2018
  
  1bfaf102
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-30 · 8fa498c0
  GitLab Bot authored Apr 30, 2018
```
# Conflicts:
#	app/models/members/group_member.rb
#	app/models/members/project_member.rb
#	app/services/notification_service.rb
#	config/initializers/omniauth.rb

[ci skip]
```
  8fa498c0
- Merge branch 'patch-28' into 'master' · 649f791e
  Achilleas Pipinellis authored Apr 30, 2018
```
Update index.md

See merge request gitlab-org/gitlab-ce!18450
```
  649f791e
- Update index.md · b5932cdf
  Shinya Maeda authored Apr 30, 2018
  
  b5932cdf
- Merge branch 'fix_ci_view_typo' into 'master' · 80695a59
  Filipa Lacerda authored Apr 30, 2018
```
Fix typo

See merge request gitlab-org/gitlab-ee!5506
```
  80695a59
- Makes namespaceless project destroy worker spec not depend on a specific migration version · f250fb16
  Tiago Botelho authored Apr 30, 2018
  
  f250fb16
- Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master' · fa7b98d5
  Douwe Maan authored Apr 30, 2018
```
Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite

See merge request gitlab-org/gitlab-ce!18580
```
  fa7b98d5
- Merge branch 'ee-add-jwt-strategy-to-gitlab-suite' into 'master' · d81891da
  Douwe Maan authored Apr 30, 2018
```
Ee add jwt strategy to gitlab suite

See merge request gitlab-org/gitlab-ee!5498
```
  d81891da