Commits · d9c923c7685a68249885e3527fadc22c946ff692 · nexedi / gitlab-ce

09 Mar, 2018 3 commits
- Fix conflicts for app/assets/images/icons.svg · d9c923c7
  Filipa Lacerda authored Mar 09, 2018
  
  d9c923c7
- Fix conflicts for app/assets/images/icons.json · 11b8a0fa
  Filipa Lacerda authored Mar 09, 2018
  
  11b8a0fa
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-09 · aec3f937
  GitLab Bot authored Mar 09, 2018
```
# Conflicts:
#	app/assets/images/icons.json
#	app/assets/images/icons.svg
#	app/assets/images/illustrations/epics.svg

[ci skip]
```
  aec3f937
08 Mar, 2018 37 commits
- Merge branch 'gitaly-fsck-mandatory' into 'master' · 47b9854d
  Douwe Maan authored Mar 08, 2018
```
Make 'git fsck' mandatory

See merge request gitlab-org/gitlab-ce!17648
```
  47b9854d
- Merge branch 'ce-to-ee-2018-03-08' into 'master' · 623da080
  Stan Hu authored Mar 08, 2018
```
CE upstream - 2018-03-08 18:24 UTC

See merge request gitlab-org/gitlab-ee!4904
```
  623da080
- Merge branch 'fl-svg' into 'master' · 7623cae9
  Clement Ho authored Mar 08, 2018
```
Update svgs content

See merge request gitlab-org/gitlab-ce!17650
```
  7623cae9
- Merge branch 'ee-fl-svg' into 'master' · 193c4fce
  Clement Ho authored Mar 08, 2018
```
Port of fl-svg to EE

See merge request gitlab-org/gitlab-ee!4902
```
  193c4fce
- Merge branch '37211-diff-comments-fix-ctrl-enter-tooltip' into 'master' · 0cee325f
  Fatih Acet authored Mar 08, 2018
```
Resolve ""You can also press Ctrl-Enter" tooltip lingers after Tab+Enter"

Closes #37211

See merge request gitlab-org/gitlab-ce!17560
```
  0cee325f
- Merge branch 'docs-update-table-tiers-boards' into 'master' · 08c407cc
  Achilleas Pipinellis authored Mar 08, 2018
```
Docs update table tiers boards

See merge request gitlab-org/gitlab-ce!17651
```
  08c407cc
- Docs update table tiers boards · e0f92a51
  Victor Wu authored Mar 08, 2018
  
  e0f92a51
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-08 · bab8d02a
  GitLab Bot authored Mar 08, 2018
  
  bab8d02a
- Merge branch 'refactor/move-mr-widget-memory-usage-and-graph-components' into 'master' · bd30d0b5
  Phil Hughes authored Mar 08, 2018
```
Move MemoryGraph and MemoryUsage vue components

See merge request gitlab-org/gitlab-ce!17533
```
  bd30d0b5
- Update svgs content · afc07fa9
  Filipa Lacerda authored Mar 08, 2018
  
  afc07fa9
- Update CHANGELOG.md for 10.5.4 · cb5cc14d
  Ian Baum authored Mar 08, 2018
```
[ci skip]
```
  cb5cc14d
- Update svgs content · 2ddb7633
  Filipa Lacerda authored Mar 08, 2018
  
  2ddb7633
- Update CHANGELOG.md for 10.5.4 · d020e657
  Ian Baum authored Mar 08, 2018
```
[ci skip]
```
  d020e657
- Update CHANGELOG-EE.md for 10.5.4-ee · a4f0c5d2
  Ian Baum authored Mar 08, 2018
```
[ci skip]
```
  a4f0c5d2
- Merge branch 'ce-to-ee-2018-03-08' into 'master' · 5336c324
  Stan Hu authored Mar 08, 2018
```
CE upstream - 2018-03-08 15:25 UTC

See merge request gitlab-org/gitlab-ee!4900
```
  5336c324
- Merge branch 'jivl-fix-delete-milestone-button-showing-up' into 'master' · 18042714
  Phil Hughes authored Mar 08, 2018
```
Fix delete milestone button showing up for all users

Closes #43778

See merge request gitlab-org/gitlab-ce!17576
```
  18042714
- Merge branch 'docs-vue-templates' into 'master' · adc5aabc
  Filipa Lacerda authored Mar 08, 2018
```
Rename VUE JS to Vue

See merge request gitlab-org/gitlab-ce!17649
```
  adc5aabc
- Move MemoryGraph and MemoryUsage vue components · 910f513a
  George Tsiolis authored Mar 05, 2018
  
  910f513a
- Merge branch 'jej/github-service-remote-url-refactor' into 'master' · 0e2c27db
  Douwe Maan authored Mar 08, 2018
```
Refactor GithubService URL handling for remote project

See merge request gitlab-org/gitlab-ee!4872
```
  0e2c27db
- Merge branch 'update-guides-10-6-ee' into 'master' · 70495879
  Robert Speicher authored Mar 08, 2018
```
Add CE to EE upgrade guide

See merge request gitlab-org/gitlab-ee!4895
```
  70495879
- Resolve conflicts in db/schema.rb · 067adfd2
  Stan Hu authored Mar 08, 2018
  
  067adfd2
- Merge branch 'ee-fl-updat-svg-dependency' into 'master' · 8ebf390f
  Clement Ho authored Mar 08, 2018
```
EE: Updates svg dependency

See merge request gitlab-org/gitlab-ee!4901
```
  8ebf390f
- Merge branch 'fl-updat-svg-dependency' into 'master' · fd85f14c
  Clement Ho authored Mar 08, 2018
```
Updates svg dependency

See merge request gitlab-org/gitlab-ce!17645
```
  fd85f14c
- Resolve conflicts in config/routes/user.rb · 30e84d21
  Stan Hu authored Mar 08, 2018
  
  30e84d21
- Fix conflicts in db/schema.rb · 2b245b6f
  Stan Hu authored Mar 08, 2018
  
  2b245b6f
- Rename VUE JS to Vue · c58dc4c9
  Clement Ho authored Mar 08, 2018
  
  c58dc4c9
- Merge branch 'sh-fix-update-service' into 'master' · c29c0b30
  James Lopez authored Mar 08, 2018
```
Fix Error 500 when updating a project

Closes #44019

See merge request gitlab-org/gitlab-ce!17647
```
  c29c0b30
- Updates svg dependency · a3a59842
  Filipa Lacerda authored Mar 08, 2018
  
  a3a59842
- Make 'git fsck' mandatory · 3ddde75a
  Kim "BKC" Carlbäcker authored Mar 08, 2018
  
  3ddde75a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-08 · 81e78711
  GitLab Bot authored Mar 08, 2018
```
# Conflicts:
#	config/routes/user.rb
#	db/schema.rb

[ci skip]
```
  81e78711
- Merge branch 'update-templates-and-dependencies-10-6' into 'master' · ac1f3bc3
  Robert Speicher authored Mar 08, 2018
```
Update templates and licenses

See merge request gitlab-org/gitlab-ce!17637
```
  ac1f3bc3
- Merge branch 'update-guides-10-6' into 'master' · 10a795b6
  Robert Speicher authored Mar 08, 2018
```
Update guides for 10.6

See merge request gitlab-org/gitlab-ce!17635
```
  10a795b6
- Fix Error 500 when updating a project · 9c8e9046
  Stan Hu authored Mar 08, 2018
```
If no parameters were specified for project features but Wikis were disabled,
we would get "NoMethodError: undefined method `[]' for nil:NilClass".

Closes #44019
```
  9c8e9046
- Updates svg dependency · bb4d877d
  Filipa Lacerda authored Mar 08, 2018
  
  bb4d877d
- Merge branch 'gitlab-git-duplicate-code' into 'master' · cb1538bb
  Sean McGivern authored Mar 08, 2018
```
Remove duplicate method definitions

See merge request gitlab-org/gitlab-ce!17478
```
  cb1538bb
- Merge branch 'ide-missing-svg' into 'master' · dfb021cc
  Filipa Lacerda authored Mar 08, 2018
```
Fixed missing SVG paths in IDE

See merge request gitlab-org/gitlab-ee!4896
```
  dfb021cc
- Merge branch '40525-listing-user-activity-timeouts' into 'master' · aec3e1dd
  Yorick Peterse authored Mar 08, 2018
```
Improve database response time for listing user activity

Closes #40525

See merge request gitlab-org/gitlab-ce!17454
```
  aec3e1dd