diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-18 15:28:02 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-18 15:28:02 +0000 |
| commit | cad4eb989e87c2e1ce996cfb5817d2c1729111c8 (patch) | |
| tree | c22d766e5f9dd8a299a3d68cd70f8a04df7e754a /app/views/dashboard | |
| parent | 02579d6aeba3673c950896bdb511df8c678e20ca (diff) | |
| parent | d8dd75ca775f66fd756e43ddd73ac75d39fc3e64 (diff) | |
| download | gitlab-ce-cad4eb989e87c2e1ce996cfb5817d2c1729111c8.tar.gz | |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/projects/issues/_nav_btns.html.haml
# app/views/projects/merge_requests/creations/_new_compare.html.haml
Diffstat (limited to 'app/views/dashboard')
| -rw-r--r-- | app/views/dashboard/issues.atom.builder | 2 | ||||
| -rw-r--r-- | app/views/dashboard/issues.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/dashboard/issues.atom.builder b/app/views/dashboard/issues.atom.builder index 70ec6bc6257..d7b6fb9a4a1 100644 --- a/app/views/dashboard/issues.atom.builder +++ b/app/views/dashboard/issues.atom.builder @@ -1,5 +1,5 @@ xml.title "#{current_user.name} issues" -xml.link href: url_for(params), rel: "self", type: "application/atom+xml" +xml.link href: url_for(safe_params), 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.updated_at.xmlschema if @issues.reorder(nil).any? diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index bb472b4c900..4bf04dadf01 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -2,12 +2,12 @@ - page_title _("Issues") - @breadcrumb_link = issues_dashboard_path(assignee_id: current_user.id) = content_for :meta_tags do - = auto_discovery_link_tag(:atom, params.merge(rss_url_options), title: "#{current_user.name} issues") + = auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{current_user.name} issues") .top-area = render 'shared/issuable/nav', type: :issues, display_count: !@no_filters_set .nav-controls - = link_to params.merge(rss_url_options), class: 'btn has-tooltip', data: { container: 'body' }, title: 'Subscribe' do + = link_to safe_params.merge(rss_url_options), class: 'btn has-tooltip', data: { container: 'body' }, title: 'Subscribe' do = icon('rss') = render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", with_feature_enabled: 'issues', type: :issues |