diff --git a/Gemfile b/Gemfile index db1671f..245522e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.2.5' +gem 'rails', '3.2.6' gem 'nokogiri' gem 'mongoid', '~> 2.4.10' diff --git a/Gemfile.lock b/Gemfile.lock index 38ac721..ee859b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,16 +2,16 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.2.5) - actionpack (= 3.2.5) + actionmailer (3.2.6) + actionpack (= 3.2.6) mail (~> 2.4.4) actionmailer_inline_css (1.3.1) actionmailer (>= 3.0.0) nokogiri (>= 1.4.4) premailer (>= 1.7.1) - actionpack (3.2.5) - activemodel (= 3.2.5) - activesupport (= 3.2.5) + actionpack (3.2.6) + activemodel (= 3.2.6) + activesupport (= 3.2.6) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.1) @@ -19,18 +19,18 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.1.3) - activemodel (3.2.5) - activesupport (= 3.2.5) + activemodel (3.2.6) + activesupport (= 3.2.6) builder (~> 3.0.0) - activerecord (3.2.5) - activemodel (= 3.2.5) - activesupport (= 3.2.5) + activerecord (3.2.6) + activemodel (= 3.2.6) + activesupport (= 3.2.6) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.5) - activemodel (= 3.2.5) - activesupport (= 3.2.5) - activesupport (3.2.5) + activeresource (3.2.6) + activemodel (= 3.2.6) + activesupport (= 3.2.6) + activesupport (3.2.6) i18n (~> 0.6) multi_json (~> 1.0) addressable (2.2.8) @@ -94,7 +94,7 @@ GEM inherited_resources (1.3.1) has_scope (~> 0.5.0) responders (~> 0.6) - journey (1.0.3) + journey (1.0.4) json (1.7.3) kaminari (0.13.0) actionpack (>= 3.0.0) @@ -174,19 +174,19 @@ GEM rack-ssl-enforcer (0.2.4) rack-test (0.6.1) rack (>= 1.0) - rails (3.2.5) - actionmailer (= 3.2.5) - actionpack (= 3.2.5) - activerecord (= 3.2.5) - activeresource (= 3.2.5) - activesupport (= 3.2.5) + rails (3.2.6) + actionmailer (= 3.2.6) + actionpack (= 3.2.6) + activerecord (= 3.2.6) + activeresource (= 3.2.6) + activesupport (= 3.2.6) bundler (~> 1.0) - railties (= 3.2.5) + railties (= 3.2.6) rails_autolink (1.0.9) rails (~> 3.1) - railties (3.2.5) - actionpack (= 3.2.5) - activesupport (= 3.2.5) + railties (3.2.6) + actionpack (= 3.2.6) + activesupport (= 3.2.6) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -293,7 +293,7 @@ DEPENDENCIES oruen_redmine_client pivotal-tracker rack-ssl-enforcer - rails (= 3.2.5) + rails (= 3.2.6) rails_autolink (~> 1.0.9) ri_cal rspec (~> 2.6) diff --git a/app/views/apps/show.html.haml b/app/views/apps/show.html.haml index 2a7092f..9ecfb4b 100644 --- a/app/views/apps/show.html.haml +++ b/app/views/apps/show.html.haml @@ -11,7 +11,7 @@ - content_for :action_bar do - if current_user.admin? = link_to 'edit', edit_app_path(@app), :class => 'button' - = link_to 'destroy', app_path(@app), :method => :delete, :confirm => 'Seriously?', :class => 'button' + = link_to 'destroy', app_path(@app), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button' - if @all_errs = link_to 'unresolved errs', app_path(@app), :class => 'button' - else diff --git a/app/views/errs/_issue_tracker_links.html.haml b/app/views/errs/_issue_tracker_links.html.haml index 3ea642e..2e36277 100644 --- a/app/views/errs/_issue_tracker_links.html.haml +++ b/app/views/errs/_issue_tracker_links.html.haml @@ -1,7 +1,7 @@ - if @app.issue_tracker_configured? || current_user.github_account? - if @problem.issue_link.present? %span= link_to 'go to issue', @problem.issue_link, :class => "#{@problem.issue_type}_goto goto-issue" - = link_to 'unlink issue', unlink_issue_app_err_path(@app, @problem), :method => :delete, :confirm => "Unlink err issues?", :class => "unlink-issue" + = link_to 'unlink issue', unlink_issue_app_err_path(@app, @problem), :method => :delete, :data => { :confirm => "Unlink err issues?" }, :class => "unlink-issue" - elsif @problem.issue_link == "pending" %span.disabled= link_to 'creating...', '#', :class => "#{@problem.issue_type}_inactive create-issue" = link_to 'retry', create_issue_app_err_path(@app, @problem), :method => :post diff --git a/app/views/errs/_table.html.haml b/app/views/errs/_table.html.haml index b026232..a8a004d 100644 --- a/app/views/errs/_table.html.haml +++ b/app/views/errs/_table.html.haml @@ -40,7 +40,7 @@ %td.issue_link - if problem.app.issue_tracker_configured? && problem.issue_link.present? && problem.issue_link != 'pending' = link_to image_tag("#{problem.issue_type}_goto.png"), problem.issue_link, :target => "_blank" - %td.resolve= link_to image_tag("thumbs-up.png"), resolve_app_err_path(problem.app, problem), :title => "Resolve", :method => :put, :confirm => err_confirm, :class => 'resolve' if problem.unresolved? + %td.resolve= link_to image_tag("thumbs-up.png"), resolve_app_err_path(problem.app, problem), :title => "Resolve", :method => :put, :data => { :confirm => err_confirm }, :class => 'resolve' if problem.unresolved? - if errs.none? %tr %td{:colspan => (any_issue_links ? 8 : 7)} diff --git a/app/views/errs/show.html.haml b/app/views/errs/show.html.haml index c21de2f..e079878 100644 --- a/app/views/errs/show.html.haml +++ b/app/views/errs/show.html.haml @@ -13,7 +13,7 @@ = last_notice_at(@problem).to_s(:precise) - content_for :action_bar do - if @problem.unresolved? - %span= link_to 'resolve', resolve_app_err_path(@app, @problem), :method => :put, :confirm => err_confirm, :class => 'resolve' + %span= link_to 'resolve', resolve_app_err_path(@app, @problem), :method => :put, :data => { :confirm => err_confirm }, :class => 'resolve' - if current_user.authentication_token %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' @@ -28,7 +28,7 @@ %table.comment %tr %th - %span= link_to '✘'.html_safe, app_err_comment_path(@app, @problem, comment), :method => :delete, :confirm => "Are sure you don't need this comment?", :class => "destroy-comment" + %span= link_to '✘'.html_safe, app_err_comment_path(@app, @problem, comment), :method => :delete, :data => { :confirm => "Are sure you don't need this comment?" }, :class => "destroy-comment" = time_ago_in_words(comment.created_at, true) << " ago by " = link_to comment.user.email, user_path(comment.user) %tr diff --git a/app/views/shared/_link_github_account.html.haml b/app/views/shared/_link_github_account.html.haml index 65c0272..feb9f17 100644 --- a/app/views/shared/_link_github_account.html.haml +++ b/app/views/shared/_link_github_account.html.haml @@ -1,5 +1,5 @@ - if Errbit::Config.github_authentication && user == current_user - if user.github_account? - %span.unlink_github= link_to "Unlink GitHub account", unlink_github_user_path(user), :method => :delete, :confirm => "Are you sure?" + %span.unlink_github= link_to "Unlink GitHub account", unlink_github_user_path(user), :method => :delete, :data => { :confirm => "Are you sure?" } - else %span.github= link_to "Link GitHub account", user_omniauth_authorize_path(:github) diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 3bbae17..5d8f8b5 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -3,7 +3,7 @@ = 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' + = link_to 'destroy', user_path(@user), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button' %table.single_user diff --git a/spec/views/errs/show.html.haml_spec.rb b/spec/views/errs/show.html.haml_spec.rb index 270cb3c..69c4b73 100644 --- a/spec/views/errs/show.html.haml_spec.rb +++ b/spec/views/errs/show.html.haml_spec.rb @@ -41,7 +41,7 @@ describe "errs/show.html.haml" do Errbit::Config.stub(:confirm_resolve_err).and_return(false) render - action_bar.should_not have_selector('a.resolve[data-confirm]') + action_bar.should have_selector('a.resolve[data-confirm="null"]') end it "should link 'up' to HTTP_REFERER if is set" do -- libgit2 0.21.2