Download as
Browse Code »

Commit 9c3bb1553942dbaa8e6db446cf7b97bbf8720b57

Authored by Vasiliy Ermolovich
1 parent 42339ceb
Exists in master and in 1 other branch production

update rails to 3.2.6 

fix confirm option deprecations
Showing 9 changed files with 35 additions and 35 deletions   Show diff stats
Gemfile
  Diff comments   View file @9c3bb15
1 1 source 'http://rubygems.org'
2 2  
3   -gem 'rails', '3.2.5'
  3 +gem 'rails', '3.2.6'
4 4  
5 5 gem 'nokogiri'
6 6 gem 'mongoid', '~> 2.4.10'
... ...
Gemfile.lock
  Diff comments   View file @9c3bb15
... ... @@ -2,16 +2,16 @@ GEM
2 2 remote: http://rubygems.org/
3 3 specs:
4 4 SystemTimer (1.2.3)
5   - actionmailer (3.2.5)
6   - actionpack (= 3.2.5)
  5 + actionmailer (3.2.6)
  6 + actionpack (= 3.2.6)
7 7 mail (~> 2.4.4)
8 8 actionmailer_inline_css (1.3.1)
9 9 actionmailer (>= 3.0.0)
10 10 nokogiri (>= 1.4.4)
11 11 premailer (>= 1.7.1)
12   - actionpack (3.2.5)
13   - activemodel (= 3.2.5)
14   - activesupport (= 3.2.5)
  12 + actionpack (3.2.6)
  13 + activemodel (= 3.2.6)
  14 + activesupport (= 3.2.6)
15 15 builder (~> 3.0.0)
16 16 erubis (~> 2.7.0)
17 17 journey (~> 1.0.1)
... ... @@ -19,18 +19,18 @@ GEM
19 19 rack-cache (~> 1.2)
20 20 rack-test (~> 0.6.1)
21 21 sprockets (~> 2.1.3)
22   - activemodel (3.2.5)
23   - activesupport (= 3.2.5)
  22 + activemodel (3.2.6)
  23 + activesupport (= 3.2.6)
24 24 builder (~> 3.0.0)
25   - activerecord (3.2.5)
26   - activemodel (= 3.2.5)
27   - activesupport (= 3.2.5)
  25 + activerecord (3.2.6)
  26 + activemodel (= 3.2.6)
  27 + activesupport (= 3.2.6)
28 28 arel (~> 3.0.2)
29 29 tzinfo (~> 0.3.29)
30   - activeresource (3.2.5)
31   - activemodel (= 3.2.5)
32   - activesupport (= 3.2.5)
33   - activesupport (3.2.5)
  30 + activeresource (3.2.6)
  31 + activemodel (= 3.2.6)
  32 + activesupport (= 3.2.6)
  33 + activesupport (3.2.6)
34 34 i18n (~> 0.6)
35 35 multi_json (~> 1.0)
36 36 addressable (2.2.8)
... ... @@ -94,7 +94,7 @@ GEM
94 94 inherited_resources (1.3.1)
95 95 has_scope (~> 0.5.0)
96 96 responders (~> 0.6)
97   - journey (1.0.3)
  97 + journey (1.0.4)
98 98 json (1.7.3)
99 99 kaminari (0.13.0)
100 100 actionpack (>= 3.0.0)
... ... @@ -174,19 +174,19 @@ GEM
174 174 rack-ssl-enforcer (0.2.4)
175 175 rack-test (0.6.1)
176 176 rack (>= 1.0)
177   - rails (3.2.5)
178   - actionmailer (= 3.2.5)
179   - actionpack (= 3.2.5)
180   - activerecord (= 3.2.5)
181   - activeresource (= 3.2.5)
182   - activesupport (= 3.2.5)
  177 + rails (3.2.6)
  178 + actionmailer (= 3.2.6)
  179 + actionpack (= 3.2.6)
  180 + activerecord (= 3.2.6)
  181 + activeresource (= 3.2.6)
  182 + activesupport (= 3.2.6)
183 183 bundler (~> 1.0)
184   - railties (= 3.2.5)
  184 + railties (= 3.2.6)
185 185 rails_autolink (1.0.9)
186 186 rails (~> 3.1)
187   - railties (3.2.5)
188   - actionpack (= 3.2.5)
189   - activesupport (= 3.2.5)
  187 + railties (3.2.6)
  188 + actionpack (= 3.2.6)
  189 + activesupport (= 3.2.6)
190 190 rack-ssl (~> 1.3.2)
191 191 rake (>= 0.8.7)
192 192 rdoc (~> 3.4)
... ... @@ -293,7 +293,7 @@ DEPENDENCIES
293 293 oruen_redmine_client
294 294 pivotal-tracker
295 295 rack-ssl-enforcer
296   - rails (= 3.2.5)
  296 + rails (= 3.2.6)
297 297 rails_autolink (~> 1.0.9)
298 298 ri_cal
299 299 rspec (~> 2.6)
... ...
app/views/apps/show.html.haml
  Diff comments   View file @9c3bb15
... ... @@ -11,7 +11,7 @@
11 11 - content_for :action_bar do
12 12 - if current_user.admin?
13 13 = link_to 'edit', edit_app_path(@app), :class => 'button'
14   - = link_to 'destroy', app_path(@app), :method => :delete, :confirm => 'Seriously?', :class => 'button'
  14 + = link_to 'destroy', app_path(@app), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
15 15 - if @all_errs
16 16 = link_to 'unresolved errs', app_path(@app), :class => 'button'
17 17 - else
... ...
app/views/errs/_issue_tracker_links.html.haml
  Diff comments   View file @9c3bb15
1 1 - if @app.issue_tracker_configured? || current_user.github_account?
2 2 - if @problem.issue_link.present?
3 3 %span= link_to 'go to issue', @problem.issue_link, :class => "#{@problem.issue_type}_goto goto-issue"
4   - = link_to 'unlink issue', unlink_issue_app_err_path(@app, @problem), :method => :delete, :confirm => "Unlink err issues?", :class => "unlink-issue"
  4 + = link_to 'unlink issue', unlink_issue_app_err_path(@app, @problem), :method => :delete, :data => { :confirm => "Unlink err issues?" }, :class => "unlink-issue"
5 5 - elsif @problem.issue_link == "pending"
6 6 %span.disabled= link_to 'creating...', '#', :class => "#{@problem.issue_type}_inactive create-issue"
7 7 = link_to 'retry', create_issue_app_err_path(@app, @problem), :method => :post
... ...
app/views/errs/_table.html.haml
  Diff comments   View file @9c3bb15
... ... @@ -40,7 +40,7 @@
40 40 %td.issue_link
41 41 - if problem.app.issue_tracker_configured? && problem.issue_link.present? && problem.issue_link != 'pending'
42 42 = link_to image_tag("#{problem.issue_type}_goto.png"), problem.issue_link, :target => "_blank"
43   - %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?
  43 + %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?
44 44 - if errs.none?
45 45 %tr
46 46 %td{:colspan => (any_issue_links ? 8 : 7)}
... ...
app/views/errs/show.html.haml
  Diff comments   View file @9c3bb15
... ... @@ -13,7 +13,7 @@
13 13 = last_notice_at(@problem).to_s(:precise)
14 14 - content_for :action_bar do
15 15 - if @problem.unresolved?
16   - %span= link_to 'resolve', resolve_app_err_path(@app, @problem), :method => :put, :confirm => err_confirm, :class => 'resolve'
  16 + %span= link_to 'resolve', resolve_app_err_path(@app, @problem), :method => :put, :data => { :confirm => err_confirm }, :class => 'resolve'
17 17 - if current_user.authentication_token
18 18 %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"
19 19 %span>= link_to 'up', (request.env['HTTP_REFERER'] ? :back : app_errs_path(@app)), :class => 'up'
... ... @@ -28,7 +28,7 @@
28 28 %table.comment
29 29 %tr
30 30 %th
31   - %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"
  31 + %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"
32 32 = time_ago_in_words(comment.created_at, true) << " ago by "
33 33 = link_to comment.user.email, user_path(comment.user)
34 34 %tr
... ...
app/views/shared/_link_github_account.html.haml
  Diff comments   View file @9c3bb15
1 1 - if Errbit::Config.github_authentication && user == current_user
2 2 - if user.github_account?
3   - %span.unlink_github= link_to "Unlink GitHub account", unlink_github_user_path(user), :method => :delete, :confirm => "Are you sure?"
  3 + %span.unlink_github= link_to "Unlink GitHub account", unlink_github_user_path(user), :method => :delete, :data => { :confirm => "Are you sure?" }
4 4 - else
5 5 %span.github= link_to "Link GitHub account", user_omniauth_authorize_path(:github)
... ...
app/views/users/show.html.haml
  Diff comments   View file @9c3bb15
... ... @@ -3,7 +3,7 @@
3 3 = render 'shared/link_github_account', :user => @user
4 4 %span= link_to('Add a New User', new_user_path, :class => 'add')
5 5 = link_to 'edit', edit_user_path(@user), :class => 'button'
6   - = link_to 'destroy', user_path(@user), :method => :delete, :confirm => 'Seriously?', :class => 'button'
  6 + = link_to 'destroy', user_path(@user), :method => :delete, :data => { :confirm => 'Seriously?' }, :class => 'button'
7 7  
8 8  
9 9 %table.single_user
... ...
spec/views/errs/show.html.haml_spec.rb
  Diff comments   View file @9c3bb15
... ... @@ -41,7 +41,7 @@ describe &quot;errs/show.html.haml&quot; do
41 41 Errbit::Config.stub(:confirm_resolve_err).and_return(false)
42 42 render
43 43  
44   - action_bar.should_not have_selector('a.resolve[data-confirm]')
  44 + action_bar.should have_selector('a.resolve[data-confirm="null"]')
45 45 end
46 46  
47 47 it "should link 'up' to HTTP_REFERER if is set" do
... ...