diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 07503fe..57539b2 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -58,7 +58,7 @@ module ApplicationHelper percent = 100.0 / total.to_f rows = tallies.map {|value, count| [(count.to_f * percent), value]} \ .sort {|a, b| a[0] <=> b[0]} - render :partial => "errs/tally_table", :locals => {:rows => rows} + render "errs/tally_table", :rows => rows end private diff --git a/app/helpers/notices_helper.rb b/app/helpers/notices_helper.rb index 86f6e4e..1c2e8f8 100644 --- a/app/helpers/notices_helper.rb +++ b/app/helpers/notices_helper.rb @@ -5,7 +5,7 @@ module NoticesHelper end def notice_atom_summary(notice) - render :partial => "notices/atom_entry.html.haml", :locals => {:notice => notice} + render "notices/atom_entry.html.haml", :notice => notice end def link_to_source_file(app, line, &block) diff --git a/app/views/apps/show.atom.builder b/app/views/apps/show.atom.builder index 424a97b..fc416c1 100644 --- a/app/views/apps/show.atom.builder +++ b/app/views/apps/show.atom.builder @@ -1,4 +1,4 @@ atom_feed do |feed| feed.title("Errbit notices for #{h @app.name} at #{root_url}") - render :partial => "errs/list", :locals => {:feed => feed} + render "errs/list", :feed => feed end diff --git a/app/views/errs/index.atom.builder b/app/views/errs/index.atom.builder index b0a77d5..55df01c 100644 --- a/app/views/errs/index.atom.builder +++ b/app/views/errs/index.atom.builder @@ -1,4 +1,4 @@ atom_feed do |feed| feed.title("Errbit notices at #{root_url}") - render :partial => "errs/list", :locals => {:feed => feed} + render "errs/list", :feed => feed end diff --git a/app/views/errs/show.html.haml b/app/views/errs/show.html.haml index 58395c3..c21de2f 100644 --- a/app/views/errs/show.html.haml +++ b/app/views/errs/show.html.haml @@ -18,7 +18,7 @@ %span= link_to 'iCal', app_err_path(:app_id => @app.id, :id => @problem.id, :format => "ics", :auth_token => current_user.authentication_token), :class => "calendar_link" %span>= link_to 'up', (request.env['HTTP_REFERER'] ? :back : app_errs_path(@app)), :class => 'up' %br - = render :partial => "issue_tracker_links" + = render "issue_tracker_links" - if Errbit::Config.allow_comments_with_issue_tracker || !@app.issue_tracker_configured? || @problem.comments.any? - content_for :comments do diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index b9e699a..8a6b127 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -25,7 +25,7 @@ #action-bar = action_bar #content - = render :partial => 'shared/flash_messages' + = render 'shared/flash_messages' = yield - if content_for?(:comments) #content-comments diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml index 14a6883..008d0a5 100644 --- a/app/views/users/edit.html.haml +++ b/app/views/users/edit.html.haml @@ -1,6 +1,6 @@ - content_for :title, "Edit #{@user.name}" - content_for :action_bar do - = render :partial => 'shared/link_github_account', :locals => {:user => @user} + = render 'shared/link_github_account', :user => @user = link_to('cancel', user_path(@user), :class => 'button') = form_for @user, :html => {:autocomplete => "off"} do |f| diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index b7a3d05..3bbae17 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -1,6 +1,6 @@ - content_for :title, @user.name - content_for :action_bar do - = render :partial => 'shared/link_github_account', :locals => {:user => @user} + = render 'shared/link_github_account', :user => @user %span= link_to('Add a New User', new_user_path, :class => 'add') = link_to 'edit', edit_user_path(@user), :class => 'button' = link_to 'destroy', user_path(@user), :method => :delete, :confirm => 'Seriously?', :class => 'button' diff --git a/spec/views/notices/_backtrace.html.haml_spec.rb b/spec/views/notices/_backtrace.html.haml_spec.rb index 53a444a..43c1ce2 100644 --- a/spec/views/notices/_backtrace.html.haml_spec.rb +++ b/spec/views/notices/_backtrace.html.haml_spec.rb @@ -12,7 +12,7 @@ describe "notices/_backtrace.html.haml" do end it "should replace nil file with [unknown source]" do - render :partial => "notices/backtrace", :locals => {:lines => @notice.backtrace} + render "notices/backtrace", :lines => @notice.backtrace rendered.should match(/\[unknown source\]/) end end -- libgit2 0.21.2