delta/gitlab/gitlab-ce.git/app/views, branch parallel-diff-alignment gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'issue_3799' into 'master' 2016-04-22T08:40:01+00:00 Rémy Coutable remy@rymai.me 2016-04-22T08:40:01+00:00 d5398e9656c1174d4d5be5a8cdad2a26d7587a27 Allow filtering by Owned projects on dashboard page Closes #3799 ![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png) See merge request !3762 

Allow filtering by Owned projects on dashboard page

Closes #3799 

![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png)

See merge request !3762
 Merge branch 'confirmation-screen' into 'master' 2016-04-22T08:34:59+00:00 Robert Speicher robert@gitlab.com 2016-04-22T08:34:59+00:00 2193a3535b3499a09f6be57f807ee5832317b574 Improved email confirmation UX Closes #4228 See merge request !3184 

Improved email confirmation UX

Closes #4228

See merge request !3184
 Merge branch 'rs-diff_view' into 'master' 2016-04-22T07:49:46+00:00 Rémy Coutable remy@rymai.me 2016-04-22T07:49:46+00:00 5a8873f362557c4002858fe323d5c346a89c91b3 Always read diff_view setting from the cookie Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285 See merge request !3732 

Always read diff_view setting from the cookie

Prior, when the user had their view set to "parallel" and then visited a
merge request's changes tab _without_ passing the `view` parameter via
query string, the view would be parallel but the `Notes` class was
always instantiated with the default value from `diff_view` ("inline"),
resulting in broken markup when the form to add a line note was
dynamically inserted.

The cookie is set whenever the view is changed, so this value should
always be up-to-date.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285

See merge request !3732
 Improved confirmation UX 2016-04-22T00:20:09+00:00 Phil Hughes me@iamphill.com 2016-03-11T16:14:29+00:00 50ed43e49099648fa5c242d0cee15f05e50349c3 Closes #4228 
Closes #4228
Merge branch 'remove-update-files' into 'master' 2016-04-21T22:23:41+00:00 Yorick Peterse yorickpeterse@gmail.com 2016-04-21T22:23:41+00:00 d35dde012984597a6e6d7d11208c7602c475d762 Removed JS update templates See merge request !3814 

Removed JS update templates

See merge request !3814
 Merge remote-tracking branch 'origin/master' into issue_3799 2016-04-21T21:03:33+00:00 Alfredo Sumaran alfredo@gitlab.com 2016-04-21T21:03:33+00:00 c9fe9f59d27bacb60c264678cce3cbe45d514a69 






Do not display filters if user if there's no current_user
2016-04-21T21:03:14+00:00

Alfredo Sumaran
alfredo@gitlab.com

2016-04-21T21:03:14+00:00

41cee8c38e61d3f00e1c79b2d170d6fc5f8bea0e












Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce
2016-04-21T17:36:43+00:00

Rémy Coutable
remy@rymai.me

2016-04-21T17:36:43+00:00

0ae039d0a1da83d6e9b4cc4ffa20279ed9928a80












Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2016-04-21T17:34:45+00:00

Rémy Coutable
remy@rymai.me

2016-04-21T17:34:45+00:00

d620d5e16009404e4972be0cd913fb0e53eaaa16












Merge branch 'label-dropdown-fix' into 'master'

2016-04-21T17:32:24+00:00

Jacob Schatz
jschatz@gitlab.com

2016-04-21T17:32:24+00:00

6a27a80867ee3ef44e8db91e3d2ffe96f8946815


Fixes "create label" functionality on label dropdown

**Issue sidebar**

![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif)

**Issues page**

![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif)



See merge request !3670





Fixes "create label" functionality on label dropdown

**Issue sidebar**

![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif)

**Issues page**

![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif)



See merge request !3670