Commits · fa5113488bf85b72395ad9ba05e3f6372890b3a2 · nexedi / gitlab-ce

20 Nov, 2018 40 commits
- Resolve spec/models/repository_spec.rb · fa511348
  Sean McGivern authored Nov 20, 2018
  
  fa511348
- Resolve spec/models/project_wiki_spec.rb · 2f50246e
  Sean McGivern authored Nov 20, 2018
  
  2f50246e
- Resolve spec/models/merge_request_spec.rb · 6bbad934
  Sean McGivern authored Nov 20, 2018
  
  6bbad934
- Resolve CHANGELOG.md · 1abe4854
  Robert Speicher authored Nov 20, 2018
```
[ci skip]
```
  1abe4854
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-20 · 7bbf09f4
  GitLab Bot authored Nov 20, 2018
```
# Conflicts:
#	CHANGELOG.md
#	locale/gitlab.pot
#	spec/models/merge_request_spec.rb
#	spec/models/project_wiki_spec.rb
#	spec/models/repository_spec.rb
#	spec/services/quick_actions/interpret_service_spec.rb

[ci skip]
```
  7bbf09f4
- Merge branch 'gt-fix-typos-in-specs-and-js' into 'master' · 27a8297d
  Filipa Lacerda authored Nov 20, 2018
```
Fix typos in specs and js

See merge request gitlab-org/gitlab-ee!8455
```
  27a8297d
- Merge branch 'frozen-string-lib-gitlab-even-even-even-more' into 'master' · 2ea250d4
  Rémy Coutable authored Nov 20, 2018
```
Enable even more frozen string for lib/gitlab

See merge request gitlab-org/gitlab-ce!23225
```
  2ea250d4
- Merge branch 'ce-to-ee-2018-11-20' into 'master' · 315a1a2f
  Sean McGivern authored Nov 20, 2018
```
CE upstream - 2018-11-20 08:21 UTC

See merge request gitlab-org/gitlab-ee!8527
```
  315a1a2f
- Merge branch '8396-exclude-code-owner-from-mr-participants' into 'master' · 50e61376
  Sean McGivern authored Nov 20, 2018
```
Exclude code owner from merge request participants to avoid spam

Closes #8396

See merge request gitlab-org/gitlab-ee!8466
```
  50e61376
- Merge branch 'patch-30' into 'master' · 22ddd1f8
  Marcia Ramos authored Nov 20, 2018
```
Update 11.3-to-11.4.md

See merge request gitlab-org/gitlab-ce!23142
```
  22ddd1f8
- Merge branch 'patch-29' into 'master' · b11cd17b
  Marcia Ramos authored Nov 20, 2018
```
Update 11.2-to-11.3.md

See merge request gitlab-org/gitlab-ce!23141
```
  b11cd17b
- Merge branch 'sh-fix-issue-50843' into 'master' · 77e89893
  Nick Thomas authored Nov 20, 2018
```
Fix PostReceive failing for project mirrors missing local branch

Closes gitlab-ce#50843

See merge request gitlab-org/gitlab-ee!8495
```
  77e89893
- Merge branch 'gt-externalize-app-views-projects-diffs' into 'master' · fa5900fb
  Phil Hughes authored Nov 20, 2018
```
Externalize strings from `/app/views/projects/diffs`

See merge request gitlab-org/gitlab-ce!23230
```
  fa5900fb
- Merge branch 'improve_migrations_docs' into 'master' · 3cf5ae31
  Yorick Peterse authored Nov 20, 2018
```
Documentation: Correct inaccurate phrase related to disable_ddl_transaction mode

See merge request gitlab-org/gitlab-ce!21175
```
  3cf5ae31
- Merge branch 'docs/post-merge-pipelines' into 'master' · 7b61774a
  Marcia Ramos authored Nov 20, 2018
```
Add docs on post-merge pipelines

Closes #53527

See merge request gitlab-org/gitlab-ce!23054
```
  7b61774a
- Merge branch 'docs/post-merge-pipelines-ee' into 'master' · 9395c4a1
  Marcia Ramos authored Nov 20, 2018
```
Add docs on post-merge pipelines

See merge request gitlab-org/gitlab-ee!8530
```
  9395c4a1
- Merge branch 'docs/direct-link-review-apps' into 'master' · aa8ae12f
  Marcia Ramos authored Nov 20, 2018
```
Add docs for linking in changed pages from MR widget

Closes #53420

See merge request gitlab-org/gitlab-ce!22990
```
  aa8ae12f
- Merge branch 'docs/direct-link-review-apps-ee' into 'master' · 74bde335
  Marcia Ramos authored Nov 20, 2018
```
Add docs for linking in changed pages from MR widget

See merge request gitlab-org/gitlab-ee!8531
```
  74bde335
- Update CHANGELOG.md for 11.4.7 · b330c3b9
  GitLab Release Tools Bot authored Nov 20, 2018
```
[ci skip]
```
  b330c3b9
- Update CHANGELOG-EE.md for 11.4.7-ee · f10fda13
  GitLab Release Tools Bot authored Nov 20, 2018
```
[ci skip]
```
  f10fda13
- Add docs for linking in changed pages from MR widget · e5885a4a
  Achilleas Pipinellis authored Nov 12, 2018
  
  e5885a4a
- Merge branch 'revert-e2aa2177' into 'master' · fd6e3781
  Sean McGivern authored Nov 20, 2018
```
Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'"

See merge request gitlab-org/gitlab-ce!23229
```
  fd6e3781
- Merge branch 'project_identicon_fix' into 'master' · 52272f92
  Kushal Pandya authored Nov 20, 2018
```
Fix a project icon in home panel view, #51157.

Closes #51157

See merge request gitlab-org/gitlab-ce!23166
```
  52272f92
- Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'" · d5bbea22
  Sean McGivern authored Nov 20, 2018
```
This reverts merge request !23140
```
  d5bbea22
- Merge branch 'gt-change-breadcrumb-title-for-contribution-charts' into 'master' · 0e26ee6c
  Kushal Pandya authored Nov 20, 2018
```
Change breadcrumb title for contribution charts

Closes #44567

See merge request gitlab-org/gitlab-ce!23071
```
  0e26ee6c
- Merge branch 'image-diff-size-fix' into 'master' · 117fb448
  Filipa Lacerda authored Nov 20, 2018
```
Fixed the dimensions of image diffs

Closes #54236

See merge request gitlab-org/gitlab-ce!23195
```
  117fb448
- Merge branch 'docs/minor-aws-fixes' into 'master' · c9b4b2a3
  Achilleas Pipinellis authored Nov 20, 2018
```
Fixes to AWS documentation

See merge request gitlab-org/gitlab-ce!23198
```
  c9b4b2a3
- Fixes to AWS documentation · 4a808d1f
  Brendan O'Leary 🐢 authored Nov 20, 2018
  
  4a808d1f
- Merge branch 'master-i18n' into 'master' · c64d11fc
  Douwe Maan authored Nov 20, 2018
```
New Crowdin translations

See merge request gitlab-org/gitlab-ee!8507
```
  c64d11fc
- Merge branch 'fix/allow-saml2-for-2fa-bypass' into 'master' · 6f0ff56e
  Douwe Maan authored Nov 20, 2018
```
saml/auth_hash: Allow 2FA bypass for SAML 2.0 responses

See merge request gitlab-org/gitlab-ce!22568
```
  6f0ff56e
- Merge branch '40085-add-a-create_merge_request-quick-action' into 'master' · 5cd0e7d2
  Douwe Maan authored Nov 20, 2018
```
Resolve "Add a `/create_merge_request` quick action"

Closes #40085

See merge request gitlab-org/gitlab-ce!22485
```
  5cd0e7d2
- Merge branch '40085-add-a-create_merge_request-quick-action-ee' into 'master' · d15f5f56
  Douwe Maan authored Nov 20, 2018
```
CE Port 22485 Creates /create_merge_request quickaction

See merge request gitlab-org/gitlab-ee!8484
```
  d15f5f56
- Merge branch '3062-improve-project-cache' into 'master' · e65e1842
  Douwe Maan authored Nov 20, 2018
```
Change project cache key to depend on ID instead of full path

Closes #42191

See merge request gitlab-org/gitlab-ce!23135
```
  e65e1842
- Merge branch 'osw-mention-when-ff-revert-should-be-picked' into 'master' · 646ba241
  Robert Speicher authored Nov 20, 2018
```
Improve FF "pick after the 7th" docs

See merge request gitlab-org/gitlab-ce!23185
```
  646ba241
- Externalize strings from `/app/views/projects/diffs` · 58b3b773
  George Tsiolis authored Nov 20, 2018
  
  58b3b773
- Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'" · 2742b871
  Sean McGivern authored Nov 20, 2018
```
This reverts merge request !23140
```
  2742b871
- Exclude code owner from participants to avoid spam · f5da5414
  Mark Chao authored Nov 15, 2018
```
Code owner was included as part of approvers.
However this would cause notifications and todos,
which can spam code owners.
Remove notifications/todo for new code owners as approvers.
```
  f5da5414
- Merge branch 'leipert-remove-duplicate-yarn-entry' into 'master' · 86e707c7
  Phil Hughes authored Nov 20, 2018
```
Remove duplicate yarn.lock entry

See merge request gitlab-org/gitlab-ee!8529
```
  86e707c7
- Merge branch 'gt-externalize-app-views-projects-environments' into 'master' · 79948637
  Kushal Pandya authored Nov 20, 2018
```
Externalize strings from `/app/views/projects/environments`

See merge request gitlab-org/gitlab-ce!23210
```
  79948637
- Merge branch 'gt-externalize-app-views-u2f' into 'master' · 59176c2c
  Kushal Pandya authored Nov 20, 2018
```
Externalize strings from `/app/views/u2f`

See merge request gitlab-org/gitlab-ce!23201
```
  59176c2c