Commits · 7913a16305b3dd4fb518e5a765c72b3b968c94d6 · nexedi / gitlab-ce

06 Sep, 2017 13 commits
- fix project_helper.rb and add couple specs to it · 7913a163
  Maxim Rydkin authored Sep 06, 2017
  
  7913a163
- Port changes from gitlab-org/gitlab-ce!13972 to EE · 5f04fc43
  Rémy Coutable authored Sep 06, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5f04fc43
- Merge branch 'ee-clean-up-new-nav-templates' into 'master' · f915aca0
  Tim Zallmann authored Sep 06, 2017
```
EE port of clean-up-new-nav-templates

See merge request !2818
```
  f915aca0
- EE port of clean-up-new-nav-templates · 94a0a2d0
  Phil Hughes authored Sep 06, 2017
  
  94a0a2d0
- Merge branch '2947-promote-webhooks' into 'master' · 76d1b79b
  Phil Hughes authored Sep 06, 2017
```
Resolve "Promote webhooks"

Closes #2947

See merge request !2802
```
  76d1b79b
- Resolve "Promote webhooks" · 5ef4a5f0
  Tim Zallmann authored Sep 06, 2017
  
  5ef4a5f0
- Merge branch '37222-extract-ee-after_create_actions' into 'master' · 3ad4f552
  Rémy Coutable authored Sep 06, 2017
```
Extract methods to EE::Projects::CreateService

Closes gitlab-ce#37222

See merge request !2831
```
  3ad4f552
- Merge branch 'tc-geo-faulty-primary-db-key' into 'master' · e26d0f5e
  Grzegorz Bizon authored Sep 06, 2017
```
Geo: Gracefully catch incorrect db key on primary

Closes #2869

See merge request !2819
```
  e26d0f5e
- Merge branch 'bvl-update-translations' into 'master' · 8e502d68
  Douwe Maan authored Sep 06, 2017
```
Update translations from crowdin

See merge request !2841
```
  8e502d68
- Remove checks if issue.author is present · 867ea02f
  Jarka Kadlecova authored Sep 06, 2017
  
  867ea02f
- Migrate issues authored by deleted user to the Ghost user · 5133c92f
  Jarka Kadlecova authored Aug 25, 2017
  
  5133c92f
- Add missing externalized strings to gitlab.pot · d9a5dcac
  Bob Van Landuyt authored Sep 06, 2017
  
  d9a5dcac
- Update translations from Crowdin · c9d8879f
  Bob Van Landuyt authored Sep 06, 2017
  
  c9d8879f
05 Sep, 2017 23 commits
- Merge branch 'winh-search-dropdowns-ee' into 'master' · 61e33265
  Clement Ho authored Sep 05, 2017
```
Make search dropdowns consistent

See merge request !2804
```
  61e33265
- Make search dropdowns consistent · bafcae5c
  Winnie Hellmann authored Sep 05, 2017
  
  bafcae5c
- Extract set_repository_size_limit_as_bytes · 2dea07dc
  Lin Jen-Shin authored Sep 05, 2017
  
  2dea07dc
- Extract EE::Projects::CreateService#after_create_actions · f7364440
  Lin Jen-Shin authored Sep 05, 2017
  
  f7364440
- Merge branch 'winh-ajax-users-dropdown-ee' into 'master' · e5e3f88e
  Phil Hughes authored Sep 05, 2017
```
Make .ajax-users-select dropdown consistent

See merge request !2829
```
  e5e3f88e
- Merge branch '37197-approved-gap' into 'master' · 060194b9
  Phil Hughes authored Sep 05, 2017
```
Removes the gap in approvers in the MR widget

Closes #3329

See merge request !2825
```
  060194b9
- Removes the gap in approvers in the MR widget · 7e43ca99
  Filipa Lacerda authored Sep 05, 2017
  
  7e43ca99
- Merge branch 'winh-admin-group-role-dropdown-ee' into 'master' · c2865f7e
  Phil Hughes authored Sep 05, 2017
```
Make role dropdown on group admin area consistent

See merge request !2830
```
  c2865f7e
- Merge branch 'ee-35010-remove-goto-project-from-breadcrumb' into 'master' · 6ab74762
  Filipa Lacerda authored Sep 05, 2017
```
EE - Remove project select dropdown from breadcrumb

See merge request !2826
```
  6ab74762
- Merge branch 'docs/rm-koding-ee' into 'master' · 1f1bdade
  Marcia Ramos authored Sep 05, 2017
```
Deprecate Koding in docs

See merge request !2812
```
  1f1bdade
- Make role dropdown on group admin area consistent · 0fad9a52
  winh authored Sep 05, 2017
  
  0fad9a52
- Make .ajax-users-select dropdown consistent · 2d4b137f
  winh authored Aug 15, 2017
  
  2d4b137f
- Merge branch '3288-fix-repository-mirroring-when-url-is-empty-string' into 'master' · 43fac907
  Douwe Maan authored Sep 05, 2017
```
Fix a regression breaking projects with an empty import URL

Closes #3288

See merge request !2824
```
  43fac907
- Merge branch '3312-fix-500-in-ssh-host-keys-action' into 'master' · e13d699a
  Douwe Maan authored Sep 05, 2017
```
Fix a 500 error in the SSH host keys lookup action

Closes #3312

See merge request !2827
```
  e13d699a
- Merge branch 'ce-to-ee-2017-09-01' into 'master' · 272abb33
  Dmitriy Zaporozhets authored Sep 05, 2017
```
CE upstream: Friday

Closes gitaly#184, gitaly#219, #3298, gitaly#486, gitlab-ce#37194, and gitlab-ce#34864

See merge request !2806
```
  272abb33
- Merge branch 'feature/sm/33281-protected-runner-executes-jobs-on-protected-branch-ee' into 'master' · 75d710bc
  Kamil Trzciński authored Sep 05, 2017
```
Port "Protected runner executes jobs on protected branch [Solution 1]" to EE

See merge request !2820
```
  75d710bc
- Fix a 500 error in the SSH host keys lookup action · 75a86ef8
  Nick Thomas authored Sep 05, 2017
  
  75a86ef8
- Merge branch 'winh-mirror-user-dropdown' into 'master' · f60f6872
  Phil Hughes authored Sep 05, 2017
```
Make mirror user dropdown in project settings consistent

See merge request !2706
```
  f60f6872
- Merge branch 'winh-merge-request-target-branch-dropdown-ee' into 'master' · c10c5134
  Phil Hughes authored Sep 05, 2017
```
Make target branch dropdown on merge request edit page consistent

See merge request !2805
```
  c10c5134
- Merge branch 'winh-protection-dropdowns-ee' into 'master' · 79fcabca
  Phil Hughes authored Sep 05, 2017
```
Make protected branches / tags permission dropdowns consistent

See merge request !2781
```
  79fcabca
- Remove spec as no longer necessary · c0b5deea
  kushalpandya authored Sep 02, 2017
  
  c0b5deea
- Remove project select dropdown from breadcrumb · f790b670
  kushalpandya authored Sep 02, 2017
  
  f790b670
- Merge branch '3232-lfs-files-pull-from-secondary' into 'master' · 04ac1711
  Robert Speicher authored Sep 05, 2017
```
Geo - Whitelist LFS requests to download objects on a secondary node

Closes #3232

See merge request !2758
```
  04ac1711
04 Sep, 2017 4 commits
- Make target branch dropdown on merge request edit page consistent · d8bee94e
  winh authored Aug 15, 2017
  
  d8bee94e
- Make protected branches / tags permission dropdowns consistent · c9ecd843
  winh authored Aug 16, 2017
  
  c9ecd843
- Fix a regression breaking projects with an empty import URL · 1c87bacb
  Nick Thomas authored Sep 04, 2017
  
  1c87bacb
- Fix bad conflict resolution · 2990c23f
  Lin Jen-Shin authored Sep 05, 2017
  
  2990c23f