diff --git a/Gemfile b/Gemfile index 06172736f..a44bdf4ef 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'http://rubygems.org' gem 'bundler', '> 1.1.0' ruby '1.9.3' if ENV['HEROKU'] -gem 'rails', '3.2.2' +gem 'rails', '3.2.5' gem 'foreman', '0.41' @@ -103,7 +103,7 @@ gem 'typhoeus' # views -gem 'haml' +gem 'haml', '3.1.6.rc.1' gem 'mobile-fu' gem 'will_paginate' diff --git a/Gemfile.lock b/Gemfile.lock index 3d734a3c8..870468fc7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,34 +41,34 @@ GEM remote: http://rubygems.org/ specs: SystemTimer (1.2.3) - actionmailer (3.2.2) - actionpack (= 3.2.2) - mail (~> 2.4.0) - actionpack (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + actionmailer (3.2.5) + actionpack (= 3.2.5) + mail (~> 2.4.4) + actionpack (3.2.5) + activemodel (= 3.2.5) + activesupport (= 3.2.5) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.1) rack (~> 1.4.0) - rack-cache (~> 1.1) + rack-cache (~> 1.2) rack-test (~> 0.6.1) - sprockets (~> 2.1.2) - activemodel (3.2.2) - activesupport (= 3.2.2) + sprockets (~> 2.1.3) + activemodel (3.2.5) + activesupport (= 3.2.5) builder (~> 3.0.0) - activerecord (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) + activerecord (3.2.5) + activemodel (= 3.2.5) + activesupport (= 3.2.5) arel (~> 3.0.2) tzinfo (~> 0.3.29) activerecord-import (0.2.9) activerecord (~> 3.0) activerecord (~> 3.0) - activeresource (3.2.2) - activemodel (= 3.2.2) - activesupport (= 3.2.2) - activesupport (3.2.2) + activeresource (3.2.5) + activemodel (= 3.2.5) + activesupport (= 3.2.5) + activesupport (3.2.5) i18n (~> 0.6) multi_json (~> 1.0) acts_as_api (0.4) @@ -197,7 +197,7 @@ GEM guard-spork (0.8.0) guard (>= 0.10.0) spork (>= 0.8.4) - haml (3.1.5) + haml (3.1.6.rc.1) handlebars_assets (0.4.4) execjs (>= 1.2.9) sprockets (>= 2.0.3) @@ -314,14 +314,14 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.2.2) - actionmailer (= 3.2.2) - actionpack (= 3.2.2) - activerecord (= 3.2.2) - activeresource (= 3.2.2) - activesupport (= 3.2.2) + rails (3.2.5) + actionmailer (= 3.2.5) + actionpack (= 3.2.5) + activerecord (= 3.2.5) + activeresource (= 3.2.5) + activesupport (= 3.2.5) bundler (~> 1.0) - railties (= 3.2.2) + railties (= 3.2.5) rails-i18n (0.6.4) i18n (~> 0.5) rails_admin (0.0.3) @@ -339,13 +339,13 @@ GEM sass-rails (~> 3.1) rails_autolink (1.0.7) rails (~> 3.1) - railties (3.2.2) - actionpack (= 3.2.2) - activesupport (= 3.2.2) + railties (3.2.5) + actionpack (= 3.2.5) + activesupport (= 3.2.5) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) - thor (~> 0.14.6) + thor (>= 0.14.6, < 2.0) raindrops (0.8.1) rake (0.9.2.2) rbx-require-relative (0.0.9) @@ -417,7 +417,7 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.14.6) + thor (0.15.2) tilt (1.3.3) timecop (0.3.5) treetop (1.4.10) @@ -486,7 +486,7 @@ DEPENDENCIES guard-cucumber guard-rspec guard-spork - haml + haml (= 3.1.6.rc.1) handlebars_assets heroku heroku_san (= 3.0.1) @@ -514,7 +514,7 @@ DEPENDENCIES rack-piwik rack-rewrite (~> 1.2.1) rack-ssl - rails (= 3.2.2) + rails (= 3.2.5) rails-i18n rails_admin (~> 0.0.3) rails_autolink diff --git a/app/views/aspects/edit.html.haml b/app/views/aspects/edit.html.haml index b5fdca3f2..0b5c43b6f 100644 --- a/app/views/aspects/edit.html.haml +++ b/app/views/aspects/edit.html.haml @@ -12,7 +12,7 @@ #aspect_name_edit.hidden = form_for @aspect, :remote => true do |aspect| = aspect.text_field :name, :maxlength => 20 - = aspect.submit t('.update'), :disable_with => t('.updating'), :class => 'button' + = aspect.submit t('.update'), 'data-disable-with' => t('.updating'), :class => 'button' - if @contacts.count > 0 = render 'shared/contact_list', :aspect => @aspect, :contacts => @contacts diff --git a/app/views/comments/_new_comment.mobile.haml b/app/views/comments/_new_comment.mobile.haml index cf0f1d4a4..97705fb48 100644 --- a/app/views/comments/_new_comment.mobile.haml +++ b/app/views/comments/_new_comment.mobile.haml @@ -7,4 +7,4 @@ .control-group = hidden_field_tag :post_id, post_id, :id => "post_id_on_#{post_id}" = text_area_tag :text, nil, :class => "span12 comment_box", :id => "comment_text_on_#{post_id}", :placeholder => t('.comment'), :autofocus => true - = submit_tag t('.comment'), :id => "comment_submit_#{post_id}", :disable_with => t('.commenting'), :class => "btn primary" + = submit_tag t('.comment'), :id => "comment_submit_#{post_id}", 'data-disable-with' => t('.commenting'), :class => "btn primary" diff --git a/app/views/conversations/_show.haml b/app/views/conversations/_show.haml index 50ecf0a28..175e65c54 100644 --- a/app/views/conversations/_show.haml +++ b/app/views/conversations/_show.haml @@ -24,4 +24,4 @@ .bd = form_for [conversation, Message.new] do |message| = message.text_area :text, :rows => 5, :tabindex => 1 - = message.submit t('.reply').capitalize, :disable_with => t('.replying'), :class => 'button creation', :tabindex => 2 + = message.submit t('.reply').capitalize, 'data-disable-with' => t('.replying'), :class => 'button creation', :tabindex => 2 diff --git a/app/views/conversations/new.haml b/app/views/conversations/new.haml index dc8f8c239..426fc8ddd 100644 --- a/app/views/conversations/new.haml +++ b/app/views/conversations/new.haml @@ -50,4 +50,4 @@ .clearfix .bottom_submit_section - = conversation.submit t('.send'), :disable_with => t('.sending'), :class => 'button creation' + = conversation.submit t('.send'), 'data-disable-with' => t('.sending'), :class => 'button creation' diff --git a/app/views/requests/_new_request_to_person.haml b/app/views/requests/_new_request_to_person.haml index d95cf9f9a..31a75df78 100644 --- a/app/views/requests/_new_request_to_person.haml +++ b/app/views/requests/_new_request_to_person.haml @@ -6,6 +6,6 @@ = form_for(Request.new, :remote => true ) do |request| = request.select(:into, options_from_collection_for_select(aspects, "id", "name")) = request.hidden_field :to, :value => destination_handle - = request.submit t('people.person.add_contact'), :disable_with => t('requests.create.sending') + = request.submit t('people.person.add_contact'), 'data-disable-with' => t('requests.create.sending') .message.hidden %i= t('.sent') diff --git a/app/views/requests/_new_request_with_aspect_to_person.haml b/app/views/requests/_new_request_with_aspect_to_person.haml index 142f0078d..2edeb9f76 100644 --- a/app/views/requests/_new_request_with_aspect_to_person.haml +++ b/app/views/requests/_new_request_with_aspect_to_person.haml @@ -6,6 +6,6 @@ = form_for Request.new, :remote => true do |request| = request.hidden_field :into, :value => "changeme" = request.hidden_field :to, :value => destination_handle - = request.submit '+', :class => 'add', :disable_with => t('requests.create.sending') + = request.submit '+', :class => 'add', 'data-disable-with' => t('requests.create.sending') .message.hidden %i= t('requests.new_request_to_person.sent')