delta/gitlab/gitlab-ce.git/spec/controllers, branch patch/fix-mergerequest-diff gitlab.com: gitlab-org/gitlab-ce.git Fixed MergeRequestController spec 2016-03-30T03:02:32+00:00 Gabriel Mazetto gabriel@gitlab.com 2016-03-30T02:55:03+00:00 808bcf5bc616af4d57011df1e37675069319e7c5 






Merge branch 'fix/nomethod-error-on-ci' into 'master'

2016-03-29T10:32:38+00:00

Rémy Coutable
remy@rymai.me

2016-03-29T10:32:38+00:00

00726e4df976e1f368a95e77b7715308f59ae264


Fix error when visiting CI root path

Closes #14528, closes #14687

See merge request !3377





Fix error when visiting CI root path

Closes #14528, closes #14687

See merge request !3377






Merge branch 'fix-14607' into 'master'

2016-03-29T08:21:48+00:00

Douwe Maan
douwe@gitlab.com

2016-03-29T08:21:48+00:00

a7ca8689f7e3a71c69c29203821b8e8b44254216


Ensure private project snippets are not viewable by unauthorized people

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607

See merge request !1946





Ensure private project snippets are not viewable by unauthorized people

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607

See merge request !1946






Redirect to root path when visiting `/ci`
2016-03-29T06:04:17+00:00

Grzegorz Bizon
grzesiek.bizon@gmail.com

2016-03-24T13:16:12+00:00

b7685b57d3fc9a2e27096c5984d92fd104ff71b7












Ensure private project snippets are not viewable by unauthorized people
2016-03-25T11:33:42+00:00

Rémy Coutable
remy@rymai.me

2016-03-25T11:31:43+00:00

f4bdefdff1861c0d0e2e6ae3418be969c2600b5f

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/14607.





Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/14607.







Add definition of before action that has been moved
2016-03-25T09:42:00+00:00

Grzegorz Bizon
grzesiek.bizon@gmail.com

2016-03-24T07:09:39+00:00

6f894bec097a4cfa378cee908d81f3cba67a09e5

Closes #14528





Closes #14528







Implementing 'Groups View' and 'TODOs View' as options for dashboard preferences.
2016-03-24T18:59:54+00:00

Elias Werberich
elias@endercoding.com

2016-03-24T10:12:45+00:00

c3a98d8fcc2f9f7a0ce8816c8cf9dbebe58e64e9

Fixes #14585.





Fixes #14585.







Merge branch 'fix-sorting-by-votes-on-groups-page' into 'master'

2016-03-23T10:35:54+00:00

Douwe Maan
douwe@gitlab.com

2016-03-23T10:35:54+00:00

703f7c5d579a6ab6d7592c24f8e3f2813d9d1703


Fix sorting issues/mrs by votes on the groups page

Closes #14394 

The `non_archived` scope applied here https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/concerns/issues_action.rb#L5 overrides the previous `ORDER BY` applied inside the IssuesFinder, with the default scope of the Project model, resulting in SQL errors.

```ruby
Issue.reorder(created_at: :desc).joins(:project).to_sql
=> "SELECT issues.* 
    FROM issues INNER JOIN projects ON projects.id = issues.project_id
    ORDER BY issues.created_at DESC"

Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived).to_sql
=> "SELECT issues.* 
    FROM issues INNER JOIN projects ON projects.id = issues.project_id 
    WHERE projects.archived = 'f'
    ORDER BY projects.id DESC"

Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived.only(:where)).to_sql
=> "SELECT issues.* 
    FROM issues INNER JOIN projects ON projects.id = issues.project_id 
    WHERE projects.archived = 'f'
    ORDER BY issues.created_at DESC"
```

/cc @yorickpeterse 

See merge request !3333





Fix sorting issues/mrs by votes on the groups page

Closes #14394 

The `non_archived` scope applied here https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/concerns/issues_action.rb#L5 overrides the previous `ORDER BY` applied inside the IssuesFinder, with the default scope of the Project model, resulting in SQL errors.

```ruby
Issue.reorder(created_at: :desc).joins(:project).to_sql
=> "SELECT issues.* 
    FROM issues INNER JOIN projects ON projects.id = issues.project_id
    ORDER BY issues.created_at DESC"

Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived).to_sql
=> "SELECT issues.* 
    FROM issues INNER JOIN projects ON projects.id = issues.project_id 
    WHERE projects.archived = 'f'
    ORDER BY projects.id DESC"

Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived.only(:where)).to_sql
=> "SELECT issues.* 
    FROM issues INNER JOIN projects ON projects.id = issues.project_id 
    WHERE projects.archived = 'f'
    ORDER BY issues.created_at DESC"
```

/cc @yorickpeterse 

See merge request !3333






Merge branch 'master' into issue_12658
2016-03-21T22:22:21+00:00

Douwe Maan
douwe@selenight.nl

2016-03-21T22:22:21+00:00

ae7b2ef62cdf61c990f914d776a6fdfc2bc49fa2

# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb





# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb







Fix sorting issues/mrs by votes on the groups page
2016-03-21T20:01:38+00:00

Douglas Barbosa Alexandre
dbalexandre@gmail.com

2016-03-21T20:01:38+00:00

100e3e7601dd4d3033cd8292814273dd0354722e

The `non_archived` scope applied here
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/conc
erns/issues_action.rb#L5 overrides the previous `ORDER BY` applied
inside the IssuesFinder, with the default scope of the Project model,
resulting in SQL errors.





The `non_archived` scope applied here
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/conc
erns/issues_action.rb#L5 overrides the previous `ORDER BY` applied
inside the IssuesFinder, with the default scope of the Project model,
resulting in SQL errors.