Commits · 7facac35b7d898666a64ec01f79663f703472156 · nexedi / gitlab-ce

15 Jan, 2018 30 commits
- Resolve form.js · 7facac35
  Luke Bennett authored Jan 15, 2018
  
  7facac35
- Resolve index.js · fb2bad26
  Luke Bennett authored Jan 15, 2018
  
  fb2bad26
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-15 · 6b03035d
  GitLab Bot authored Jan 15, 2018
```
# Conflicts:
#	app/assets/javascripts/pages/projects/edit/index.js
#	app/assets/javascripts/pages/projects/issues/form.js

[ci skip]
```
  6b03035d
- Merge branch 'ee-dispatcher-projects-efi' into 'master' · b11f1ba1
  Phil Hughes authored Jan 15, 2018
```
dynamic imports for projects:e/f/i

See merge request gitlab-org/gitlab-ee!4077
```
  b11f1ba1
- Merge branch 'dispatcher-projects-efi' into 'master' · cedbf9c8
  Phil Hughes authored Jan 15, 2018
```
dynamic imports for projects:e/f/i

See merge request gitlab-org/gitlab-ce!16417
```
  cedbf9c8
- Merge branch '41546-count-query-for-issues-and-mrs-runs-twice-on-group-index' into 'master' · cc18608d
  Grzegorz Bizon authored Jan 15, 2018
```
Resolve "Count query for issues and MRs runs twice on group index"

Closes #41546

See merge request gitlab-org/gitlab-ce!16314
```
  cc18608d
- Merge branch '42025-fix-issue-api' into 'master' · 02aa5009
  Sean McGivern authored Jan 15, 2018
```
[API] Fix creating issue when assignee_id is empty

Closes gitlab-ce#42025

See merge request gitlab-org/gitlab-ee!4083
```
  02aa5009
- Merge branch 'ce-to-ee-2018-01-15' into 'master' · 632bbd32
  Marin Jankovski authored Jan 15, 2018
```
CE upstream - Monday

Closes gitaly#893

See merge request gitlab-org/gitlab-ee!4079
```
  632bbd32
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ee-dispatcher-projects-efi · 9a2a47c9
  Simon Knox authored Jan 15, 2018
  
  9a2a47c9
- [API] Fix creating issue when assignee_id is empty · 73a4359d
  Valery Sizov authored Jan 15, 2018
```
See https://gitlab.com/gitlab-org/gitlab-ce/issues/42025
```
  73a4359d
- dedupe form · 56e57355
  Simon Knox authored Jan 15, 2018
  
  56e57355
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into dispatcher-projects-efi · 5a062dfa
  Simon Knox authored Jan 15, 2018
  
  5a062dfa
- dedupe · e2f82f4a
  Simon Knox authored Jan 15, 2018
  
  e2f82f4a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-15 · b754ffeb
  GitLab Bot authored Jan 15, 2018
  
  b754ffeb
- fix tests - add missing WeightSelect · d97309ae
  Simon Knox authored Jan 15, 2018
  
  d97309ae
- 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
- dynamic imports for projects:e/f/i · 80005e96
  Simon Knox authored Jan 15, 2018
  
  80005e96
- Log and send a system hook if a blocked user fails to login · 0d187a9a
  Stan Hu authored Jan 14, 2018
```
Closes #41633
```
  0d187a9a
- removed unneeded lint comments · 78c962e3
  Simon Knox authored Jan 15, 2018
  
  78c962e3
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into dispatcher-projects-efi · 6f59e713
  Simon Knox authored Jan 15, 2018
  
  6f59e713
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 4 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