delta/gitlab/gitlab-ce.git/spec/controllers, branch parallel-diff-alignment

Merge branch 'rs-diff_view' into 'master'

2016-04-22T07:49:46+00:00


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

Merge branch 'issue_5838' into 'master'

2016-04-21T10:31:20+00:00


Show project members only for members

fixes #5838 

See merge request !3752

Add changelog entry and fix convention in a spec

2016-04-20T15:41:35+00:00

Clarify that the diff view setting always comes from the cookie

2016-04-19T21:47:58+00:00

This invalidates one test, which we've removed.

Merge branch 'pmq20/gitlab-ce-issue_12785'

2016-04-19T16:25:42+00:00

Check permissions when sharing project with group

2016-04-19T10:15:56+00:00

Closes #15330

Projects members tab should follow visibility levels

2016-04-18T20:53:34+00:00

Show project members only for members

2016-04-18T20:53:34+00:00

Remove group members check

2016-04-18T14:12:28+00:00

Insert users check into api

2016-04-18T14:12:27+00:00