Commit graph

9 commits

Author SHA1 Message Date
Clement Ho
f9e2b4730f Merge branch 'master' into 'bootstrap4'
# Conflicts:
#   app/views/projects/branches/_branch.html.haml
2018-05-01 16:21:47 +00:00
Phil Hughes
2f7b71df76 Merge branch '10-7-security_issue_42029' into 'security-10-7'
Sanitize user name to avoid XSS attacks

See merge request gitlab/gitlabhq!2373
2018-04-30 15:01:01 -05:00
Clement Ho
ef7f002e31 Merge branch 'bootstrap4' of gitlab.com:gitlab-org/gitlab-ce into bootstrap4 2018-04-25 10:53:15 -05:00
Simon Knox
dc69ae177b fix dropdown fixture, BS4 wants dropdown-menu 2018-04-25 12:56:27 +10:00
Mike Greiling
8fa0aeb880
fix illegal references to "this" in module context 2018-04-23 00:54:20 -05:00
Mike Greiling
f248be7257
require jQuery to be explicitly imported 2018-03-09 15:18:09 -06:00
Jacob Schatz
35c8fd5586 Update to jQuery 3. 2018-02-20 22:20:48 +00:00
Phil Hughes
ff0f74ac6e
Tidy up main JS file 2018-01-10 11:07:42 +00:00
Eric Eastwood
90c60138db Move "Move to different project" to sidebar
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34261
2017-09-03 22:03:17 -05:00