Commits · 3e0f81e275de284e8c4c4434b95bd8d26223c53c · nexedi / gitlab-ce

23 May, 2018 20 commits
- Use the new CacheableAttributes concern in the ApplicationSetting and Appearance models · 3e0f81e2
  Rémy Coutable authored May 04, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  3e0f81e2
- Introduce a new CacheableAttributes concern · 7f38f84f
  Rémy Coutable authored May 04, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  7f38f84f
- Merge branch 'issue_5128' into 'master' · f0486994
  Rémy Coutable authored May 23, 2018
```
Allow viewing only one board when multiple issue boards is not enabled

Closes #5128

See merge request gitlab-org/gitlab-ee!5741
```
  f0486994
- Merge branch '5949-render_optional' into 'master' · fff246d3
  Rémy Coutable authored May 23, 2018
```
Use render_if_exists to hide EE specific codes

Closes #5949

See merge request gitlab-org/gitlab-ee!5767
```
  fff246d3
- Use render_if_exists to hide EE specific codes · ae83dd1a
  Lin Jen-Shin authored May 23, 2018
  
  ae83dd1a
- Merge branch 'rs-boards-issues-create-service-parity-ee' into 'master' · 288595cc
  Rémy Coutable authored May 23, 2018
```
Bring CE-EE parity to app/services/boards/issues/create_service.rb

See merge request gitlab-org/gitlab-ee!5810
```
  288595cc
- Fix typo · e8408ba5
  Philippe Lafoucrière authored May 23, 2018
```
[skip ci]
```
  e8408ba5
- 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 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
- No deeplink needed · 5159a479
  Sid Sijbrandij authored May 23, 2018
  
  5159a479
22 May, 2018 20 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
- 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
- Bring CE-EE parity to app/services/boards/issues/create_service.rb · 1fc42935
  Robert Speicher authored May 22, 2018
  
  1fc42935
- 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
- Allow viewing only one board when multiple issue boards is not enabled · d61acd6d
  Felipe Artur authored May 16, 2018
  
  d61acd6d
- 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
- Merge branch 'fix/unverified-hover-state' into 'master' · 5045ca06
  Annabel Gray authored May 22, 2018
```
unverified hover state color changed to almost-black

See merge request gitlab-org/gitlab-ce!19031
```
  5045ca06
- unverified hover state color changed to almost-black · 683f9720
  Murat Dogan authored May 22, 2018
  
  683f9720
- Merge branch 'workhorse-4.2.1' into 'master' · f80ba922
  Alessio Caiazza authored May 22, 2018
```
Upgrade workhorse to v4.2.1

See merge request gitlab-org/gitlab-ce!19087
```
  f80ba922
- Merge branch 'dz-no-ee-check' into 'master' · 0c977d17
  Rémy Coutable authored May 22, 2018
```
Add check for top-level ee directory in CE repo

Closes #46239

See merge request gitlab-org/gitlab-ce!19062
```
  0c977d17