Commits · 10e1077fcb24c0e729104a59cfb2d0967fea4578 · nexedi / gitlab-ce

23 May, 2018 25 commits
- Resolve CE to EE merge conflict · 10e1077f
  Olivier Gonzalez authored May 23, 2018
  
  10e1077f
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-23 · f8d775a8
  GitLab Bot authored May 23, 2018
```
# Conflicts:
#	doc/user/project/integrations/project_services.md

[ci skip]
```
  f8d775a8
- Merge branch 'use-git-depth-1-on-cng-trigger' into 'master' · acdb7435
  Rémy Coutable authored May 23, 2018
```
Set GIT_DEPTH to 1 to speed up cloning for the cloud images trigger

See merge request gitlab-org/gitlab-ce!19098
```
  acdb7435
- Merge branch 'ce-to-ee-2018-05-23' into 'master' · 756bd842
  Phil Hughes authored May 23, 2018
```
CE upstream - 2018-05-23 09:39 UTC

See merge request gitlab-org/gitlab-ee!5820
```
  756bd842
- fixed conflicts in api.js · 51b94860
  Phil Hughes authored May 23, 2018
  
  51b94860
- Merge branch 'issue-25256' into 'master' · 3f7b9244
  Douwe Maan authored May 23, 2018
```
skip email trim when email is creating new issue

See merge request gitlab-org/gitlab-ce!18865
```
  3f7b9244
- Merge branch 'gitaly-repo-squash-in-progress-opt-out' into 'master' · d6d7abb1
  Douwe Maan authored May 23, 2018
```
Make Repo#squash_in_progress Opt-Out

See merge request gitlab-org/gitlab-ce!19088
```
  d6d7abb1
- Merge branch 'gitaly-wiki-get-formatted-data-opt-out' into 'master' · 91f3930c
  Douwe Maan authored May 23, 2018
```
Move Wiki::GetFormattedData to OptOut

See merge request gitlab-org/gitlab-ce!19091
```
  91f3930c
- Merge branch 'gitaly-import-project-opt-out' into 'master' · 68b5cd71
  Douwe Maan authored May 23, 2018
```
Move ImportProject to OptOut in Gitaly

See merge request gitlab-org/gitlab-ce!19090
```
  68b5cd71
- Merge branch 'gitaly-repo-info-attributes-opt-out' into 'master' · 18ed49c9
  Douwe Maan authored May 23, 2018
```
Move Repository#info_attributes to OptOut in gitaly

See merge request gitlab-org/gitlab-ce!19092
```
  18ed49c9
- Merge branch... · 7f484cd1
  Douwe Maan authored May 23, 2018
```
Merge branch '22846-notifications-broken-during-email-address-change-before-email-confirmed' into 'master'

Resolve "notifications broken during email address change before email confirmed"

Closes #22846

See merge request gitlab-org/gitlab-ce!18474
```
  7f484cd1
- Merge branch '46354-deprecate_gemnasium_service' into 'master' · b71c990a
  Douwe Maan authored May 23, 2018
```
Resolve "Deprecate Gemnasium project service"

Closes #46354

See merge request gitlab-org/gitlab-ce!18954
```
  b71c990a
- Resolve "Deprecate Gemnasium project service" · 40dd12c7
  Olivier Gonzalez authored May 23, 2018
  
  40dd12c7
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-23 · 15dae8c3
  GitLab Bot authored May 23, 2018
```
# Conflicts:
#	app/assets/javascripts/api.js

[ci skip]
```
  15dae8c3
- Merge branch '45530-web-ide-doesn-t-work-for-branches-with-slashes' into 'master' · f0fbdad9
  Douwe Maan authored May 23, 2018
```
Resolve "Web IDE doesn't work for branches with slashes"

Closes #45530

See merge request gitlab-org/gitlab-ce!18878
```
  f0fbdad9
- Resolve "Web IDE doesn't work for branches with slashes" · 8056a77d
  Tim Zallmann authored May 23, 2018
  
  8056a77d
- Merge branch 'ide-commit-state-bug' into 'master' · 3a3f542d
  Filipa Lacerda authored May 23, 2018
```
Fixed web IDE review & commit editors getting into incorrect state

Closes #46392

See merge request gitlab-org/gitlab-ce!19038
```
  3a3f542d
- Merge branch '46603-add-vue-loader-cache' into 'master' · 4ba8ff50
  Fatih Acet authored May 23, 2018
```
Resolve "Add vue-loader compile caching to frontend build process"

Closes #46603

See merge request gitlab-org/gitlab-ce!19099
```
  4ba8ff50
- Merge branch 'ide-jobs-list' into 'master' · 7e1e3559
  Filipa Lacerda authored May 23, 2018
```
Pipelines store actions & states in web IDE

Closes #44604

See merge request gitlab-org/gitlab-ce!18912
```
  7e1e3559
- Merge branch 'ide-file-finder-improve-order' into 'master' · 1623e4ac
  Filipa Lacerda authored May 23, 2018
```
Fixed IDE file finder ordering

See merge request gitlab-org/gitlab-ce!18948
```
  1623e4ac
- fixed spec · fff2b4f6
  Phil Hughes authored May 23, 2018
  
  fff2b4f6
- Merge branch 'ce-to-ee-2018-05-22' into 'master' · 8d8c89ff
  Grzegorz Bizon authored May 23, 2018
```
CE upstream - 2018-05-22 21:23 UTC

See merge request gitlab-org/gitlab-ee!5814
```
  8d8c89ff
- resolve conflict in locale/gitlab.pot · bd7061ba
  Lukas Eipert authored May 23, 2018
  
  bd7061ba
- skip email trim when email is creating new issue · 421dbb17
  Cameron Crockett authored May 09, 2018
```
Updates from MR discussion

1. Added test for ReplyParser
2. Changed param to trim_reply with default set as true

Removed keyword param in favor of normal options param

updates for MR discussion

Resolutions for code review comments

more code review fixes
```
  421dbb17
- No deeplink needed · 5159a479
  Sid Sijbrandij authored May 23, 2018
  
  5159a479
22 May, 2018 15 commits
- add file cache to vue-loader to speed up compilation · 7774b318
  Mike Greiling authored May 22, 2018
  
  7774b318
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-22 · a3859c0f
  GitLab Bot authored May 22, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  a3859c0f
- Merge branch '44895-explicit-merge-conflict' into 'master' · 76e276cb
  Tim Zallmann authored May 22, 2018
```
Resolve "Make explicit that merge conflict feature commits to source branch"

Closes #44895

See merge request gitlab-org/gitlab-ce!18921
```
  76e276cb
- Set GIT_DEPTH to 1 to speed up cloning for the cloud images trigger · d394226e
  DJ Mountney authored May 22, 2018
  
  d394226e
- Merge branch 'silver-to-premium' into 'master' · 49478523
  Victor Wu authored May 22, 2018
```
Update Silver to say Premium

See merge request gitlab-org/gitlab-ee!5812
```
  49478523
- Merge branch 'ce-to-ee-2018-05-22' into 'master' · e205e4b0
  Stan Hu authored May 22, 2018
```
CE upstream - 2018-05-22 18:27 UTC

See merge request gitlab-org/gitlab-ee!5811
```
  e205e4b0
- Update Silver to say Premium · 87d25d5c
  Victor Wu authored May 22, 2018
  
  87d25d5c
- Merge branch 'winh-make-it-right-now' into 'master' · 4c63e904
  Annabel Gray authored May 22, 2018
```
Use "right now" for short time periods

Closes #40563

See merge request gitlab-org/gitlab-ce!19095
```
  4c63e904
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-22 · f7c55b83
  GitLab Bot authored May 22, 2018
  
  f7c55b83
- Use "right now" for short time periods · 1d6025fd
  Winnie Hellmann authored May 22, 2018
  
  1d6025fd
- Merge branch 'ce-to-ee-2018-05-22' into 'master' · 87aef527
  Rémy Coutable authored May 22, 2018
```
CE upstream - 2018-05-22 12:51 UTC

See merge request gitlab-org/gitlab-ee!5804
```
  87aef527
- Merge branch '5919_follow_up_on_5151_dismiss_vulnerability' into 'master' · 36c98d24
  Robert Speicher authored May 22, 2018
```
Resolve Follow up on dismiss vulnerability or create issue

See merge request gitlab-org/gitlab-ee!5756
```
  36c98d24
- Resolve Follow up on dismiss vulnerability or create issue · a79d5d85
  Olivier Gonzalez authored May 22, 2018
  
  a79d5d85
- Merge branch 'dm-xcode-project-directory' into 'master' · f8568baa
  Robert Speicher authored May 22, 2018
```
Fix Xcode project detection by looking for dirs instead of files

See merge request gitlab-org/gitlab-ce!19035
```
  f8568baa
- added spec · 23a7c389
  Phil Hughes authored May 22, 2018
  
  23a7c389