Commits · 640630b850e5c807fc16782b2ad49e7a9778ac37 · nexedi / gitlab-ce

10 Jul, 2018 16 commits
- Rename code climate to code quality · 640630b8
  Achilleas Pipinellis (🌴 July 10 - July 20 🌴) authored Jul 10, 2018
  
  640630b8
- Merge branch '6117-unify-preview-mailer' into 'master' · 9875d44a
  Sean McGivern authored Jul 10, 2018
```
Resolve "Extract EE specific files/lines for spec/mailers, app/mailers/preview"

Closes #6117

See merge request gitlab-org/gitlab-ee!6442
```
  9875d44a
- Merge branch 'revert-39851dfa' into 'master' · 5455f905
  Grzegorz Bizon authored Jul 10, 2018
```
Revert "Merge branch 'gitaly-with-config' into 'master'"

See merge request gitlab-org/gitlab-ee!6446
```
  5455f905
- Make sure we use the top-level ones · 72899b87
  Lin Jen-Shin authored Jul 10, 2018
  
  72899b87
- Add Preview namespace to EE extension so Rails · 2e7f3792
  Lin Jen-Shin authored Jul 10, 2018
```
could find it better?
```
  2e7f3792
- Merge branch 'rd-add-support-for-gl-com-trials' into 'master' · fc50dc31
  Sean McGivern authored Jul 10, 2018
```
Update billing section to support GitLab.com trials

See merge request gitlab-org/gitlab-ee!6252
```
  fc50dc31
- Merge branch 'master' into 'rd-add-support-for-gl-com-trials' · 75e1faf2
  Sean McGivern authored Jul 10, 2018
```
# Conflicts:
#   locale/gitlab.pot
```
  75e1faf2
- Move the EE extension to EE directory · 700e532e
  Lin Jen-Shin authored Jul 10, 2018
  
  700e532e
- Revert "Merge branch 'gitaly-with-config' into 'master'" · f4a7ca8b
  Jacob Vosmaer (GitLab) authored Jul 10, 2018
```
This reverts merge request !6428
```
  f4a7ca8b
- Merge branch 'jira-dev-panel-docs-update' into 'master' · 7abbde6e
  Sean McGivern authored Jul 10, 2018
```
Jira dev panel docs update

See merge request gitlab-org/gitlab-ee!6413
```
  7abbde6e
- Merge branch 'winh-stop-all-environments-ee' into 'master' · f0f3e4ec
  Phil Hughes authored Jul 10, 2018
```
Support manually stopping any environment from the UI (EE-port)

Closes gitlab-ce#25388

See merge request gitlab-org/gitlab-ee!6398
```
  f0f3e4ec
- Support manually stopping any environment from the UI (EE-port) · b59377dc
  Winnie Hellmann authored Jul 10, 2018
  
  b59377dc
- Merge branch... · 9a3f7d55
  Achilleas Pipinellis (🌴 July 10 - July 20 🌴) authored Jul 10, 2018
```
Merge branch '6850-docs-update-clarify-use-of-exact-phrase-searching-when-using-advanced-search' into 'master'

Resolve "docs update - clarify use of exact phrase searching when using advanced search"

Closes #6850

See merge request gitlab-org/gitlab-ee!6421
```
  9a3f7d55
- Merge branch '3871-move-ee-specific-javascript-tests-to-ee-part-1' into 'master' · 40c0337d
  Phil Hughes authored Jul 10, 2018
```
Part 1 of "Move EE JavaScript tests to their own respective directory"

See merge request gitlab-org/gitlab-ee!6184
```
  40c0337d
- Merge branch '6265-primary-geo-node-can-t-be-removed-from-non-secondary-machines' into 'master' · d0a81caf
  Stan Hu authored Jul 10, 2018
```
Resolve "Primary geo node can't be removed from non-secondary machines"

Closes #6265

See merge request gitlab-org/gitlab-ee!6248
```
  d0a81caf
- Resolve "Primary geo node can't be removed from non-secondary machines" · fe183502
  Brett Walker (back July 17 🌴) authored Jul 10, 2018
  
  fe183502
09 Jul, 2018 24 commits
- Add ability to generate a Gold trial from Billing settings page · 8fd17fd4
  Rubén Dávila authored Jul 09, 2018
  
  8fd17fd4
- 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 '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
- Use arrow functions in test_bundle.js · 9145daf6
  Winnie Hellmann authored Jul 09, 2018
  
  9145daf6
- 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
- Move EE specific tests to their own file · f709e99f
  Lin Jen-Shin authored Jul 10, 2018
  
  f709e99f
- 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
- Move EE specific preview to its own module · a251b8f6
  Lin Jen-Shin authored Jul 10, 2018
  
  a251b8f6
- 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 '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
- 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 '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 'sh-fix-issue-47797' into 'master' · d8f0ada5
  Douwe Maan authored Jul 09, 2018
```
Fix handling of annotated tags when Gitaly is not in use

Closes gitlab-ce#47797

See merge request gitlab-org/gitlab-ee!6423
```
  d8f0ada5
- Add missing translations · 6107e9b4
  Bob Van Landuyt authored Jul 09, 2018
  
  6107e9b4
- Resolve conflicts in `doc/ci/variables/README.md` · 1fcb613c
  Bob Van Landuyt authored Jul 09, 2018
  
  1fcb613c
- Regenerate `locale/gitlab.pot` · acf20752
  Bob Van Landuyt authored Jul 09, 2018
  
  acf20752
- Resolve conflicts in `db/schema.rb` · 31fb606a
  Bob Van Landuyt authored Jul 09, 2018
  
  31fb606a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-09 · 3f1f13d6
  GitLab Bot authored Jul 09, 2018
```
# Conflicts:
#	db/schema.rb
#	doc/ci/variables/README.md
#	locale/gitlab.pot

[ci skip]
```
  3f1f13d6