diff options
author | barthc <mackintosh02@gmail.com> | 2016-06-17 17:52:17 +0100 |
---|---|---|
committer | barthc <mackintosh02@gmail.com> | 2016-06-17 17:52:17 +0100 |
commit | 4f8915497dc3938856541bad0fd8113ed1929ebb (patch) | |
tree | 0526e4a7d4784fa7bbbac87e0c1af09c482f5229 /app/views/dashboard | |
parent | 9b6c7e365fbf297d72a0c2770d5b8837da2f4879 (diff) | |
parent | 3764f1184b50a84014433383c3a50c1edd3e1671 (diff) | |
download | gitlab-ce-4f8915497dc3938856541bad0fd8113ed1929ebb.tar.gz |
Merge branch 'master' into fix-double-query-string-url
Diffstat (limited to 'app/views/dashboard')
-rw-r--r-- | app/views/dashboard/_groups_head.html.haml | 1 | ||||
-rw-r--r-- | app/views/dashboard/_projects_head.html.haml | 1 | ||||
-rw-r--r-- | app/views/dashboard/issues.atom.builder | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/app/views/dashboard/_groups_head.html.haml b/app/views/dashboard/_groups_head.html.haml index 3d17f74b709..23c145ebbb4 100644 --- a/app/views/dashboard/_groups_head.html.haml +++ b/app/views/dashboard/_groups_head.html.haml @@ -9,5 +9,4 @@ - if current_user.can_create_group? .nav-controls = link_to new_group_path, class: "btn btn-new" do - = icon('plus') New Group diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml index 5a6c6113d19..8a98d119ec5 100644 --- a/app/views/dashboard/_projects_head.html.haml +++ b/app/views/dashboard/_projects_head.html.haml @@ -18,5 +18,4 @@ = render 'shared/projects/dropdown' - if current_user.can_create_project? = link_to new_project_path, class: 'btn btn-new' do - = icon('plus') New Project diff --git a/app/views/dashboard/issues.atom.builder b/app/views/dashboard/issues.atom.builder index 83c0c6da21b..0404d0728ea 100644 --- a/app/views/dashboard/issues.atom.builder +++ b/app/views/dashboard/issues.atom.builder @@ -4,7 +4,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear xml.link href: issues_dashboard_url(format: :atom, private_token: current_user.try(:private_token)), rel: "self", type: "application/atom+xml" xml.link href: issues_dashboard_url, rel: "alternate", type: "text/html" xml.id issues_dashboard_url - xml.updated @issues.first.created_at.xmlschema if @issues.any? + xml.updated @issues.first.created_at.xmlschema if @issues.reorder(nil).any? - xml << render(partial: 'issues/issue', collection: @issues) if @issues.any? + xml << render(partial: 'issues/issue', collection: @issues) if @issues.reorder(nil).any? end |