Permalink
Browse files

bundle update, rails 3.2.6

  • Loading branch information...
1 parent 820d832 commit 75916ca1a87c9895759523e987b2a63f165e7920 @chloerei committed Jun 24, 2012
View
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.2.3'
+gem 'rails', '3.2.6'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -9,7 +9,7 @@ gem 'bcrypt-ruby'
gem 'mongoid'
gem 'bson_ext'
gem 'haml'
-gem 'twitter-bootstrap-rails', '2.0.3'
+gem 'twitter-bootstrap-rails'
gem 'client_side_validations', :git => 'git://github.com/bcardarella/client_side_validations.git'
gem 'client_side_validations-mongoid'
gem 'kaminari'
View
@@ -1,52 +1,52 @@
GIT
remote: git://github.com/bcardarella/client_side_validations.git
- revision: f74b9c301850ff66cf563bfe0845364d1823eb99
+ revision: 9ab27ad0941ba89380a4b8949d7783bcb9691f24
specs:
client_side_validations (3.2.0.beta.3)
GIT
remote: git://github.com/jgraichen/rails-timeago.git
- revision: b07ecc618efb719c57eb8ae33bbdb65817a448fd
+ revision: e1b3c142e54b1ed3c5dbf390a713477c1ce79a00
specs:
- rails-timeago (1.2.0.rc2)
+ rails-timeago (1.4.0)
actionpack (>= 3.1)
activesupport (>= 3.1)
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.3)
- actionpack (= 3.2.3)
+ actionmailer (3.2.6)
+ actionpack (= 3.2.6)
mail (~> 2.4.4)
- actionpack (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
+ actionpack (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.3)
- activesupport (= 3.2.3)
+ sprockets (~> 2.1.3)
+ activemodel (3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
- activerecord (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
+ activerecord (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
- activesupport (3.2.3)
+ activeresource (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ activesupport (3.2.6)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
bcrypt-ruby (3.0.1)
- bson (1.6.2)
- bson_ext (1.6.2)
- bson (~> 1.6.2)
+ bson (1.6.4)
+ bson_ext (1.6.4)
+ bson (~> 1.6.4)
builder (3.0.0)
capistrano (2.12.0)
highline
@@ -64,57 +64,56 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.1)
+ coffee-script-source (1.3.3)
commonjs (0.2.6)
erubis (2.7.0)
- execjs (1.3.1)
+ execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (3.2.0)
+ factory_girl (3.5.0)
activesupport (>= 3.0.0)
- factory_girl_rails (3.2.0)
- factory_girl (~> 3.2.0)
+ factory_girl_rails (3.5.0)
+ factory_girl (~> 3.5.0)
railties (>= 3.0.0)
gravtastic (3.2.6)
- haml (3.1.4)
+ haml (3.1.6)
highlight_js-rails (0.0.2)
rails (>= 3.1.1)
- highline (1.6.11)
+ highline (1.6.13)
hike (1.2.1)
http_accept_language (1.0.2)
i18n (0.6.0)
- journey (1.0.3)
+ journey (1.0.4)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
- json (1.7.0)
+ json (1.7.3)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
- less (2.0.12)
- commonjs (~> 0.2.0)
- therubyracer (~> 0.9.9)
- less-rails (2.1.8)
+ less (2.2.1)
+ commonjs (~> 0.2.6)
+ less-rails (2.2.3)
actionpack (>= 3.1)
- less (~> 2.0.7)
+ less (~> 2.2.0)
libv8 (3.3.10.4)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.18)
+ mime-types (1.19)
mongo (1.6.2)
bson (~> 1.6.2)
- mongoid (2.4.9)
+ mongoid (2.4.11)
activemodel (~> 3.1)
- mongo (~> 1.3)
+ mongo (<= 1.6.2)
tzinfo (~> 0.3.22)
- multi_json (1.3.4)
+ multi_json (1.3.6)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.3.0)
+ net-ssh (2.5.2)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
polyglot (0.3.3)
@@ -125,30 +124,30 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.3)
- actionmailer (= 3.2.3)
- actionpack (= 3.2.3)
- activerecord (= 3.2.3)
- activeresource (= 3.2.3)
- activesupport (= 3.2.3)
+ 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.3)
- rails-i18n (0.6.3)
+ railties (= 3.2.6)
+ rails-i18n (0.6.4)
i18n (~> 0.5)
- railties (3.2.3)
- actionpack (= 3.2.3)
- activesupport (= 3.2.3)
+ railties (3.2.6)
+ actionpack (= 3.2.6)
+ activesupport (= 3.2.6)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
redcarpet (2.1.1)
- rvm-capistrano (1.1.0)
+ rvm-capistrano (1.2.2)
capistrano (>= 2.0.0)
- sass (3.1.17)
+ sass (3.1.19)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -157,21 +156,22 @@ GEM
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- therubyracer (0.9.10)
+ therubyracer (0.10.1)
libv8 (~> 3.3.10)
- thor (0.14.6)
+ thor (0.15.3)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- twitter-bootstrap-rails (2.0.3)
+ twitter-bootstrap-rails (2.1.0)
actionpack (>= 3.1)
- less-rails (~> 2.1.6)
+ less-rails (~> 2.2.2)
railties (>= 3.1)
+ therubyracer (~> 0.10.1)
tzinfo (0.3.33)
- uglifier (1.2.4)
+ uglifier (1.2.5)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
+ multi_json (~> 1.3)
whenever (0.7.3)
activesupport (>= 2.3.4)
chronic (~> 0.6.3)
@@ -196,14 +196,14 @@ DEPENDENCIES
jquery-rails
kaminari
mongoid
- rails (= 3.2.3)
+ rails (= 3.2.6)
rails-i18n
rails-timeago!
redcarpet
rvm-capistrano
sass-rails
therubyracer
- twitter-bootstrap-rails (= 2.0.3)
+ twitter-bootstrap-rails
uglifier
whenever
wmd-rails
@@ -23,4 +23,4 @@
#sidebar.span3
%section.box
%header= t '.action'
- = button_to t('delete'), admin_reply_path(@reply), :class => 'btn btn-danger', :method => :delete, :confirm => t('.delete_confirm')
+ = button_to t('delete'), admin_reply_path(@reply), :class => 'btn btn-danger', :method => :delete, :data => {:confirm => t('.delete_confirm')}
@@ -19,14 +19,14 @@
- if @topic.edited_at
%dt= t 'edited_at'
%dd= format_time @topic.edited_at
- %dt= t '.content'
+ %dt= t '.content'
%dd
%pre~ @topic.content
- %dt= t '.marker_count'
+ %dt= t '.marker_count'
%dd= @topic.marker_count
- %dt= t '.replies_count'
+ %dt= t '.replies_count'
%dd= @topic.replies_count
#sidebar.span3
%section.box
%header= t '.action'
- = button_to t('delete'), admin_topic_path(@topic), :class => 'btn btn-danger', :method => :delete, :confirm => t('.delete_confirm', :title => @topic.title)
+ = button_to t('delete'), admin_topic_path(@topic), :class => 'btn btn-danger', :method => :delete, :data => {:confirm => t('.delete_confirm', :title => @topic.title)}
@@ -59,4 +59,4 @@
#sidebar.span3
%section.box
%header= t '.action'
- = button_to t('delete'), admin_user_path(@user), :class => 'btn btn-danger', :method => :delete, :confirm => t('.delete_confirm', :name => @user.name)
+ = button_to t('delete'), admin_user_path(@user), :class => 'btn btn-danger', :method => :delete, :data => {:confirm => t('.delete_confirm', :name => @user.name)}
@@ -18,4 +18,4 @@
#sidebar.span3
= render :partial => 'shared/sidebar_profile'
%section.box
- = button_to t('.mark_all_as_read'), mark_all_as_read_notifications_path, :class => 'btn', :disable_with => t('.marking'), :remote => true, :method => :put
+ = button_to t('.mark_all_as_read'), mark_all_as_read_notifications_path, :class => 'btn', :data => {:disable_with => t('.marking')}, :remote => true, :method => :put
@@ -54,7 +54,7 @@
%h4= t('.post_reply')
= form_for @reply, :url => replies_path(:topic_id => @topic), :remote => true do |f|
= render :partial => 'replies/form', :object => f
- .control-group= f.submit t('submit'), :class => 'btn primary', :disable_with => t('form_disable_with')
+ .control-group= f.submit t('submit'), :class => 'btn primary', :data => {:disable_with => t('form_disable_with')}
#sidebar.span3
- if logined?

0 comments on commit 75916ca

Please sign in to comment.