delta/gitlab/gitlab-ce.git/lib, branch issue-title-vue

update to current master and fix conflicts

2017-03-21T15:08:28+00:00

Merge branch 'index-routes-path-for-like' into 'master'

2017-03-21T13:48:09+00:00


Add LIKE index for routes.path

Closes #29554

See merge request !10060

Add a rake task to reset all email and private tokens

2017-03-21T13:36:46+00:00

Merge branch 'api-project-issues-404' into 'master'

2017-03-21T11:57:38+00:00


Return 404 in project issues API endpoint when project cannot be found

Closes #29631

See merge request !10093

Add LIKE index for routes.path

2017-03-21T10:49:24+00:00

Nested groups support uses queries along the lines of `path LIKE 'X/%'`.
For these queries to use an index on PostgreSQL we need to use either
the varchar_pattern_ops or text_pattern_ops operator class.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29554

Merge branch '29685-wrong-number-of-arguments-calling-http_url_to_repo-on-cloning-project-wikis' into 'master'

2017-03-21T10:39:57+00:00


Fix ProjectWiki#http_url_to_repo signature

Closes #29685

See merge request !10079

Merge branch 'sh-fix-admin-application-settings' into 'master'

2017-03-21T07:21:01+00:00


Fix Error 500 when application settings are saved

Closes #29674 and #29115

See merge request !10070

Merge remote-tracking branch 'dev/master'

2017-03-21T01:55:40+00:00

Merge branch 'ssrf' into 'security'

2017-03-21T01:53:45+00:00


nil check for url_blocker?

See merge request !2076

Merge branch 'ssrf' into 'security'

2017-03-21T01:53:04+00:00


Protect server against SSRF in project import URLs

See merge request !2068