Commits · b754ffebde363be8b48b0c1bf800f87a8da97131 · nexedi / gitlab-ce

15 Jan, 2018 13 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-15 · b754ffeb
  GitLab Bot authored Jan 15, 2018
  
  b754ffeb
- Merge branch 'fj-41598-fixing-request-mime-type' into 'master' · f402762d
  Douwe Maan authored Jan 15, 2018
```
Fixing request json mime type

Closes #41598

See merge request gitlab-org/gitlab-ce!16427
```
  f402762d
- Fixing request json mime type · 4f6e0379
  Francisco Javier López authored Jan 15, 2018
  
  4f6e0379
- Merge branch 'snippets-dispatcher-refactor' into 'master' · b3d85110
  Phil Hughes authored Jan 15, 2018
```
Refactor dispatcher for snippets:*

See merge request gitlab-org/gitlab-ce!16390
```
  b3d85110
- Merge branch 'ee-snippets-dispatcher-refactor' into 'master' · c8bd4405
  Phil Hughes authored Jan 15, 2018
```
Refactor dispatcher for snippets:* (EE Version)

See merge request gitlab-org/gitlab-ee!4037
```
  c8bd4405
- Merge branch 'ee-dispatcher-project-mr' into 'master' · 46f119aa
  Phil Hughes authored Jan 15, 2018
```
Refactor dispatcher project mr index path (EE)

See merge request gitlab-org/gitlab-ee!4028
```
  46f119aa
- Merge branch 'dispatcher-project-mr' into 'master' · 55e2bafc
  Phil Hughes authored Jan 15, 2018
```
Refactor dispatcher project mr index path

Closes #41341

See merge request gitlab-org/gitlab-ce!16399
```
  55e2bafc
- Merge branch 'ee-dispatcher-branches-create' into 'master' · ca2b0327
  Phil Hughes authored Jan 15, 2018
```
Refactor dispatcher project branches create path (EE)

See merge request gitlab-org/gitlab-ee!4012
```
  ca2b0327
- Merge branch 'sh-log-when-user-blocked' into 'master' · 5e3ef302
  Douwe Maan authored Jan 15, 2018
```
Log and send a system hook if a blocked user attempts to login

Closes #41633

See merge request gitlab-org/gitlab-ce!16451
```
  5e3ef302
- Merge branch 'dispatcher-branches-create' into 'master' · 598d81cd
  Phil Hughes authored Jan 15, 2018
```
Refactor dispatcher project branches create path

See merge request gitlab-org/gitlab-ce!16380
```
  598d81cd
- Merge branch 'patch-28' into 'master' · 923d087b
  Grzegorz Bizon authored Jan 15, 2018
```
Improve after_script docs in yaml/README.md

See merge request gitlab-org/gitlab-ce!16444
```
  923d087b
- Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master' · 6277ef8e
  Grzegorz Bizon authored Jan 15, 2018
```
Migrate Repository#can_be_merged? to Gitaly

Closes gitaly#893

See merge request gitlab-org/gitlab-ce!16316
```
  6277ef8e
- Log and send a system hook if a blocked user fails to login · 0d187a9a
  Stan Hu authored Jan 14, 2018
```
Closes #41633
```
  0d187a9a
13 Jan, 2018 6 commits
- Merge branch 'ce-to-ee-2018-01-13' into 'master' · ba8bf2ad
  Stan Hu authored Jan 13, 2018
```
CE upstream - Saturday

Closes gitlab-ce#41891 and #2383

See merge request gitlab-org/gitlab-ee!4065
```
  ba8bf2ad
- Resolve conflict in app/assets/javascripts/dispatcher.js · fc3ca478
  Stan Hu authored Jan 13, 2018
  
  fc3ca478
- Improve after_script docs in yaml/README.md · 0f16e34c
  Damian Nowak authored Jan 13, 2018
  
  0f16e34c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-13 · 0a432caf
  GitLab Bot authored Jan 13, 2018
```
# Conflicts:
#	app/assets/javascripts/dispatcher.js

[ci skip]
```
  0a432caf
- Merge branch 'ce-to-ee-2018-01-12' into 'master' · 1674970a
  Robert Speicher authored Jan 13, 2018
```
CE upstream - Friday

See merge request gitlab-org/gitlab-ee!4060
```
  1674970a
- Resolve conflicts in Project and Repository models · 0e2f4f55
  Robert Speicher authored Jan 12, 2018
  
  0e2f4f55
12 Jan, 2018 21 commits
- Merge branch '16988-use-toggle-for-subscribed-unsubscribed-to-notifications' into 'master' · 74f2f9b3
  Annabel Dunstone Gray authored Jan 12, 2018
```
Resolve "Use toggle for subscribed/unsubscribed to notifications"

Closes #16988

See merge request gitlab-org/gitlab-ce!16408
```
  74f2f9b3
- Merge branch 'rename-prometheus-to-monitoring' into 'master' · 6b5b93ab
  Stan Hu authored Jan 12, 2018
```
Rename ~Prometheus to ~Monitoring

See merge request gitlab-org/gitlab-ce!16442
```
  6b5b93ab
- Rename ~Prometheus to ~Monitoring · b80cec44
  Fabio Busatto authored Jan 12, 2018
  
  b80cec44
- Merge branch '4596-fix-geo-repositoriescleanupworker-to-work-with-hashed-storage' into 'master' · 5f99ecc9
  Stan Hu authored Jan 12, 2018
```
Resolve "Fix Geo::RepositoriesCleanUpWorker to work with hashed storage"

Closes #4596

See merge request gitlab-org/gitlab-ee!4059
```
  5f99ecc9
- Merge branch 'jramsay-4264-geo-ip-docs' into 'master' · df530ed0
  Stan Hu authored Jan 12, 2018
```
Add explicit GCP private address docs to geo

Closes #4264

See merge request gitlab-org/gitlab-ee!3767
```
  df530ed0
- Merge branch 'ee-display-mr-in-commit-page' into 'master' · d9b5a1d6
  Clement Ho authored Jan 12, 2018
```
Display related merge requests in commit detail page

See merge request gitlab-org/gitlab-ee!4049
```
  d9b5a1d6
- Display related merge requests in commit detail page · f0ab2249
  Sean McGivern authored Jan 12, 2018
  
  f0ab2249
- change loading prop behavior for subscriptions.vue · 0815236f
  Mike Greiling authored Jan 12, 2018
  
  0815236f
- Merge branch 'fix_gitlab-ce#41891' into 'master' · a52d8c10
  Annabel Dunstone Gray authored Jan 12, 2018
```
fix gitlab-org/gitlab-ce#41891 (design nitpick)

Closes #41891

See merge request gitlab-org/gitlab-ce!16383
```
  a52d8c10
- Merge branch 'display-mr-in-commit-page' into 'master' · 9978602d
  Clement Ho authored Jan 12, 2018
```
Display related merge requests in commit detail page

Closes #2383

See merge request gitlab-org/gitlab-ce!13713
```
  9978602d
- Display related merge requests in commit detail page · a7d26f00
  Hiroyuki Sato authored Jan 12, 2018
  
  a7d26f00
- Merge branch 'projects-l' into 'master' · 1b5f1795
  Filipa Lacerda authored Jan 12, 2018
```
Refactor projects:l*

See merge request gitlab-org/gitlab-ce!16393
```
  1b5f1795
- Make Rubocop happy · 448933c6
  Douglas Barbosa Alexandre authored Jan 12, 2018
  
  448933c6
- add missing comma · 562991b6
  Mike Greiling authored Jan 12, 2018
  
  562991b6
- Merge branch '40492-update-admin-dashboard-content-order' into 'master' · e4aa2bd3
  Annabel Dunstone Gray authored Jan 12, 2018
```
Move row containing Projects, Users and Groups count to the top

Closes #40492

See merge request gitlab-org/gitlab-ce!16421
```
  e4aa2bd3
- Move row containing Projects, Users and Groups count to the top · ae294641
  Kushal Pandya authored Jan 12, 2018
  
  ae294641
- Resolve projects.scss conflict and move into ee · f40b1b69
  Eric Eastwood authored Jan 12, 2018
  
  f40b1b69
- Merge branch 'bw-fix-code-indentation-doc' into 'master' · b904d538
  Nick Thomas authored Jan 12, 2018
```
Fix incorrect code indentation

See merge request gitlab-org/gitlab-ee!4056
```
  b904d538
- Add more inclusive language of other vendors · 8a1f77d3
  James Ramsay authored Jan 12, 2018
  
  8a1f77d3
- Refactor into init_labels · d85f72b1
  Clement Ho authored Jan 12, 2018
  
  d85f72b1
- Use common form.js · cad87a05
  Clement Ho authored Jan 12, 2018
  
  cad87a05