Commits · 0ed54aa8ee79f66c23c3bc0fd10bfdff1a0aad92 · nexedi / gitlab-ce

18 Jan, 2018 20 commits
- Small fixes to Geo database configuration doc · 0ed54aa8
  Toon Claes authored Jan 10, 2018
  
  0ed54aa8
- Merge branch 'ce-to-ee-2018-01-18' into 'master' · cf0bdf3a
  Rémy Coutable authored Jan 18, 2018
```
CE upstream - Thursday

See merge request gitlab-org/gitlab-ee!4143
```
  cf0bdf3a
- Resolve project_hook.rb · 1d2021ea
  Luke Bennett authored Jan 18, 2018
  
  1d2021ea
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-18 · d1085ef8
  GitLab Bot authored Jan 18, 2018
```
# Conflicts:
#	app/models/hooks/project_hook.rb

[ci skip]
```
  d1085ef8
- Merge branch 'feature/merge-request-system-hook' into 'master' · 8e9c073a
  Douwe Maan authored Jan 18, 2018
```
System hooks for Merge Requests

See merge request gitlab-org/gitlab-ce!14387
```
  8e9c073a
- Merge branch 'ee-feature/merge-request-system-hook' into 'master' · 4431246d
  Douwe Maan authored Jan 18, 2018
```
Add system hooks for merge requests

Closes #4519

See merge request gitlab-org/gitlab-ee!3924
```
  4431246d
- Merge branch 'ce-to-ee-2018-01-18' into 'master' · 59fab5de
  Luke Bennett authored Jan 18, 2018
```
CE upstream - Thursday

See merge request gitlab-org/gitlab-ee!4139
```
  59fab5de
- Merge branch '42129-fix-project-snippet-user-agent-detail' into 'master' · d617c24f
  Sean McGivern authored Jan 18, 2018
```
Fix the user-agent detail API endpoint for project snippets

Closes #42129

See merge request gitlab-org/gitlab-ce!16521
```
  d617c24f
- Merge branch 'winh-stop-jobs-modal' into 'master' · 2af0b083
  Phil Hughes authored Jan 18, 2018
```
Add modal for stopping jobs in admin area

Closes #41305

See merge request gitlab-org/gitlab-ce!16283
```
  2af0b083
- Merge branch 'jramsay-improved-convdev-image-docs' into 'master' · 646ec660
  Sean McGivern authored Jan 18, 2018
```
Update ConvDev Index docs w better screenshot

See merge request gitlab-org/gitlab-ce!16533
```
  646ec660
- Merge branch 'add-opensuse-to-supported-list' into 'master' · a18f2921
  Marin Jankovski authored Jan 18, 2018
```
Add openSUSE to the supported Unix OS list

See merge request gitlab-org/gitlab-ce!16544
```
  a18f2921
- Add openSUSE to the supported Unix OS list · 644e6b26
  Balasankar C authored Jan 18, 2018
  
  644e6b26
- Merge branch 'patch-28' into 'master' · 6f283ddf
  Achilleas Pipinellis authored Jan 18, 2018
```
Remove a broken link in the docs

See merge request gitlab-org/gitlab-ce!16532
```
  6f283ddf
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-18 · 126c03f4
  GitLab Bot authored Jan 18, 2018
  
  126c03f4
- Merge branch 'rc/port-from-ee-4119' into 'master' · f721be27
  Sean McGivern authored Jan 18, 2018
```
Add the :migration metadata, and don't use factories in FixWronglyRenamedRoutes spec

See merge request gitlab-org/gitlab-ce!16535
```
  f721be27
- Add modal for stopping jobs in admin area · 76f16bbf
  Winnie Hellmann authored Jan 08, 2018
  
  76f16bbf
- Merge branch '34252-trailing-plus' into 'master' · f82ccd63
  Phil Hughes authored Jan 18, 2018
```
Resolve "Cannot filter issues by labels ending with a plus char in board view"

Closes #41715 and #34252

See merge request gitlab-org/gitlab-ce!16490
```
  f82ccd63
- Merge branch 'ce-to-ee-2018-01-18' into 'master' · 6aad9fdc
  Robert Speicher authored Jan 18, 2018
```
CE upstream - Thursday

See merge request gitlab-org/gitlab-ee!4132
```
  6aad9fdc
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-18 · 9e79d18d
  GitLab Bot authored Jan 18, 2018
  
  9e79d18d
- Merge branch '41743-unused-selectors-for-cycle-analytics' into 'master' · a4eb71dc
  Annabel Dunstone Gray authored Jan 18, 2018
```
Remove unused CSS selectors for Cycle Analytics (between 1st iteration and 2nd iteration)

Closes #41743

See merge request gitlab-org/gitlab-ce!16270
```
  a4eb71dc
17 Jan, 2018 20 commits
- Merge branch 'ce-to-ee-2018-01-17' into 'master' · 2a993dda
  Rémy Coutable authored Jan 17, 2018
```
CE upstream - Wednesday

See merge request gitlab-org/gitlab-ee!4128
```
  2a993dda
- Merge branch 'file-content-large-screen-padding' into 'master' · f04b2b91
  Annabel Dunstone Gray authored Jan 17, 2018
```
Double padding for file-content wiki class on larger screens

See merge request gitlab-org/gitlab-ce!16534
```
  f04b2b91
- Merge branch 'winh-search-page-filters' into 'master' · 6fc51682
  Clement Ho authored Jan 17, 2018
```
Filter groups and projects dropdowns of search page on backend

Closes #38739

See merge request gitlab-org/gitlab-ce!16336
```
  6fc51682
- Filter groups and projects dropdowns of search page on backend · be8c4af8
  Winnie Hellmann authored Jan 17, 2018
  
  be8c4af8
- sentence-case changelog entry · dd49a428
  Simon Knox authored Jan 18, 2018
  
  dd49a428
- Add the :migration metadata, and don't use factories in FixWronglyRenamedRoutes spec · 941485ef
  Rémy Coutable authored Jan 17, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  941485ef
- Double padding for file-content wiki class on larger screens · fe2a1413
  tauriedavis authored Jan 17, 2018
  
  fe2a1413
- feature spec for #34252 · 7a9c9416
  Simon Knox authored Jan 18, 2018
```
https://gitlab.com/gitlab-org/gitlab-ce/issues/34252
```
  7a9c9416
- Remove errant newline from system hooks documentation · 4b4b34c2
  Robert Speicher authored Jan 17, 2018
```
[ci skip]
```
  4b4b34c2
- consistent code style · e66a25a2
  Simon Knox authored Jan 18, 2018
  
  e66a25a2
- Merge branch 'fj-42112-fix-deploy-keys-migration-mysql' into 'master' · 5392568e
  Stan Hu authored Jan 17, 2018
```
Fix bug in security release with deploy keys migration

See merge request gitlab-org/gitlab-ce!16531
```
  5392568e
- Update ConvDev Index docs w better screenshot · 414c574f
  James Ramsay authored Jan 17, 2018
  
  414c574f
- Remove the second link, blog URL has changed hands and I can't find any new blog by this guy. · 05b878df
  Connor Shea authored Jan 17, 2018
  
  05b878df
- Adjust conflict on deploy_keys_controller.rb · 0fdb3b5e
  Oswaldo Ferreira authored Jan 17, 2018
  
  0fdb3b5e
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-17 · 92dfaa86
  GitLab Bot authored Jan 17, 2018
```
# Conflicts:
#	app/controllers/projects/deploy_keys_controller.rb

[ci skip]
```
  92dfaa86
- Merge branch 'rs-buttons-partial' into 'master' · e7ec1db6
  Rémy Coutable authored Jan 17, 2018
```
Further simplify app/views/projects/buttons/_dropdown.html.haml

See merge request gitlab-org/gitlab-ce!16503
```
  e7ec1db6
- Merge branch 'ce-to-ee-2018-01-17' into 'master' · 3f293df3
  Robert Speicher authored Jan 17, 2018
```
CE upstream - Wednesday

Closes #4378

See merge request gitlab-org/gitlab-ee!4126
```
  3f293df3
- Applied fix · fcaf89a1
  Francisco Javier López authored Jan 17, 2018
  
  fcaf89a1
- Merge branch 'sh-backport-10-3-4-security-fixes' into 'master' · f351cc28
  Oswaldo Ferreira authored Jan 17, 2018
```
Backport 10.3.4 security fixes into master

See merge request gitlab-org/gitlab-ce!16509
```
  f351cc28
- Merge branch 'sh-backport-10-3-4-security-fixes-ee' into 'master' · eb7cd4b6
  Stan Hu authored Jan 17, 2018
```
[EE] Port 10.3.4 security fixes into master

See merge request gitlab-org/gitlab-ee!4122
```
  eb7cd4b6