Commits · bc523d96d3e3836ccfc03d7aeee15e8c7adbde5c · nexedi / gitlab-ce

10 Jul, 2018 4 commits
- Fix a typo? gitaly_operation{-s-}_client · bc523d96
  Lin Jen-Shin authored Jul 10, 2018
  
  bc523d96
- Resolve spec/models/user_spec.rb · 7b4600ed
  Lin Jen-Shin authored Jul 10, 2018
  
  7b4600ed
- Resolve spec/models/ci/build_spec.rb · 7a664159
  Lin Jen-Shin authored Jul 10, 2018
  
  7a664159
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-10 · 269ed8e3
  GitLab Bot authored Jul 10, 2018
```
# Conflicts:
#	spec/models/ci/build_spec.rb
#	spec/models/user_spec.rb

[ci skip]
```
  269ed8e3
09 Jul, 2018 36 commits
- Merge branch 'ce-to-ee-2018-07-09' into 'master' · bf89c2a3
  Stan Hu authored Jul 09, 2018
```
CE upstream - 2018-07-09 13:37 UTC

Closes gitaly#331, gitaly#384, gitaly#446, gitaly#383, gitaly#593, gitaly#566, gitaly#670, gitaly#528, and gitaly#222

See merge request gitlab-org/gitlab-ee!6433
```
  bf89c2a3
- Merge branch 'winh-fix-frontend-link-docs' into 'master' · 255db3d5
  Annabel Gray authored Jul 09, 2018
```
Fix link to frontend in handbook

See merge request gitlab-org/gitlab-ce!20504
```
  255db3d5
- Fix link to frontend in handbook · 6b733bc4
  Winnie Hellmann authored Jul 09, 2018
  
  6b733bc4
- Merge branch 'sh-shorten-filenames-changelog' into 'master' · c0280ac3
  Felipe Artur authored Jul 09, 2018
```
Shorten CHANGELOG filename to avoid breaking ecryptfs users

Closes #49038

See merge request gitlab-org/gitlab-ce!20512
```
  c0280ac3
- Shorten CHANGELOG filename to avoid breaking ecryptfs users · 0198057b
  Stan Hu authored Jul 09, 2018
```
[ci skip]

Closes #49038
```
  0198057b
- Replace... · 1fb0fc3a
  Felipe Artur authored Jul 09, 2018
```
Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-subclass-of-gitlab-backgroundmigration-fixcrossprojectlabellinks-namespace.yml
```
  1fb0fc3a
- Merge branch 'master' into ce-to-ee-2018-07-09 · 5c6fa8f3
  Stan Hu authored Jul 09, 2018
  
  5c6fa8f3
- Merge branch 'mk/geo/fix-repo-updated-race-condition' into 'master' · 2c477c1c
  Nick Thomas authored Jul 09, 2018
```
Geo: Fix repository updated replication race condition

Closes #5489

See merge request gitlab-org/gitlab-ee!6161
```
  2c477c1c
- Merge branch 'gitaly-with-config' into 'master' · 39851dfa
  Nick Thomas authored Jul 09, 2018
```
Use gitaly to set/unset git config

Closes gitaly#1241

See merge request gitlab-org/gitlab-ee!6428
```
  39851dfa
- Use gitaly to set/unset git config · 8c2e2e1c
  Jacob Vosmaer (GitLab) authored Jul 09, 2018
  
  8c2e2e1c
- Stop passing around `redownload` unnecessarily · 7e911edc
  Michael Kozono authored Jun 20, 2018
  
  7e911edc
- Fix race condition · e10c719d
  Michael Kozono authored Jul 03, 2018
  
  e10c719d
- Merge branch 'add-issue-links-to-api-readme-docs' into 'master' · 46cae736
  Victor Wu authored Jul 09, 2018
```
add issue links to API README

See merge request gitlab-org/gitlab-ee!6441
```
  46cae736
- Make ProjectRegistry responsible for its own sync state · 6aa71d9d
  Michael Kozono authored Jul 03, 2018
  
  6aa71d9d
- Store when a registry is marked dirty · f6dfba53
  Michael Kozono authored Jun 13, 2018
  
  f6dfba53
- add issue links to API README · 77111e06
  abuerer authored Jul 09, 2018
  
  77111e06
- Merge branch 'minor-update-ssh-key-docs' into 'master' · 3edda4c2
  Achilleas Pipinellis (🌴 July 10 - July 20 🌴) authored Jul 09, 2018
```
Add additional headline for Adding SSH keys to GitLab

Closes #46395

See merge request gitlab-org/gitlab-ce!20507
```
  3edda4c2
- Merge branch 'winh-waiting-in-tests-docs' into 'master' · a0935bf2
  Tim Zallmann authored Jul 09, 2018
```
Document that we don't want to wait in tests

See merge request gitlab-org/gitlab-ce!20502
```
  a0935bf2
- Merge branch 'bvl-add-missing-translations' into 'master' · 6902a422
  Rémy Coutable authored Jul 09, 2018
```
Add missing translations

See merge request gitlab-org/gitlab-ee!6434
```
  6902a422
- Add additional headline for Adding SSH keys to GitLab · e6a49b00
  Andreas Kämmerle authored Jul 09, 2018
  
  e6a49b00
- Merge branch 'od/41671' into 'master' · 630dfb41
  Mike Greiling authored Jul 09, 2018
```
Preserve the correct start/due dates on milestones when editing

Closes #41671

See merge request gitlab-org/gitlab-ce!20279
```
  630dfb41
- Merge branch 'update-rubocop' · 2a4039cf
  Sean McGivern authored Jul 09, 2018
  
  2a4039cf
- Merge branch 'dz-remote-badges-from-readme' into 'master' · ab3c91a7
  Rémy Coutable authored Jul 09, 2018
```
Remove badges from README.md in favor of GitLab badges feature

Closes #48895

See merge request gitlab-org/gitlab-ce!20447
```
  ab3c91a7
- Merge branch 'ee-dz-remote-badges-from-readme' into 'master' · d025c5cd
  Rémy Coutable authored Jul 09, 2018
```
Remove badges from README.md in favor of GitLab badges feature

See merge request gitlab-org/gitlab-ee!6425
```
  d025c5cd
- Merge branch 'master' into 'master' · 5535e513
  Rémy Coutable authored Jul 09, 2018
```
Request to be a proofreader.

See merge request gitlab-org/gitlab-ce!19423
```
  5535e513
- Request to be a proofreader. · 963cd5a5
  Yi-Jyun Pan authored Jul 09, 2018
  
  963cd5a5
- Merge branch 'rails5-mysql-fix-pr-importer-spec' into 'master' · c7e98067
  Rémy Coutable authored Jul 09, 2018
```
Rails5 mysql fix milliseconds problem in pull request importer spec

See merge request gitlab-org/gitlab-ce!20475
```
  c7e98067
- Merge branch 'gitaly-update-branch' into 'master' · 2cedb243
  Robert Speicher authored Jul 09, 2018
```
Use Gitaly's OperationService.UserUpdateBranch RPC

Closes gitaly#1252

See merge request gitlab-org/gitlab-ce!20231
```
  2cedb243
- Merge branch 'use-correct-script-location' into 'master' · 55db9338
  Rémy Coutable authored Jul 09, 2018
```
Use the correct script location for the build trigger script

See merge request gitlab-org/gitlab-ce!20454
```
  55db9338
- Merge branch 'upgrade-hamlit-for-ruby25' into 'master' · 780af30f
  Rémy Coutable authored Jul 09, 2018
```
Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045

Closes #42045

See merge request gitlab-org/gitlab-ce!20315
```
  780af30f
- Merge branch 'fix-search-bar' into 'master' · fc607521
  Mike Greiling authored Jul 09, 2018
```
Fix search bar text input alignment

Closes #48288

See merge request gitlab-org/gitlab-ce!20155
```
  fc607521
- Fix search bar text input alignment · 5e8ff175
  Clement Ho authored Jul 09, 2018
  
  5e8ff175
- Merge branch 'ee-update-rubocop' into 'master' · b79b2a5d
  Sean McGivern authored Jul 09, 2018
```
EE: Update rubocop

See merge request gitlab-org/gitlab-ee!6376
```
  b79b2a5d
- Merge branch 'rails5-fix-48977' into 'master' · e2f7fbe4
  Rémy Coutable authored Jul 09, 2018
```
Rails5 fix mysql milliseconds problem in specs

Closes #48977

See merge request gitlab-org/gitlab-ce!20464
```
  e2f7fbe4
- Merge branch 'rails5-update-gemfile-lock' into 'master' · 4bb26e7d
  Rémy Coutable authored Jul 09, 2018
```
Update Gemfile.rails5.lock with latest Gemfile.lock changes

See merge request gitlab-org/gitlab-ce!20466
```
  4bb26e7d
- Merge branch '48970-markdown-wiki-help-incorrect-in-how-wiki-pages-are-rendered' into 'master' · b7b28363
  Sean McGivern authored Jul 09, 2018
```
Resolve "Markdown help incorrect in how wiki pages are rendered"

Closes #48970

See merge request gitlab-org/gitlab-ce!20459
```
  b7b28363