aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock84
2 files changed, 44 insertions, 44 deletions
diff --git a/Gemfile b/Gemfile
index 347c911..a8928bb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,8 +16,8 @@ end
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', '~> 3.2.3'
- gem 'coffee-rails', '~> 3.2.1'
+ gem 'sass-rails', '~> 3.2'
+ gem 'coffee-rails', '~> 3.2'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', :platforms => :ruby
diff --git a/Gemfile.lock b/Gemfile.lock
index f17d73d..f2c7b96 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,12 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.12)
- actionpack (= 3.2.12)
- mail (~> 2.4.4)
- actionpack (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ actionmailer (3.2.13)
+ actionpack (= 3.2.13)
+ mail (~> 2.5.3)
+ actionpack (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
@@ -14,25 +14,25 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.12)
- activesupport (= 3.2.12)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
- activesupport (3.2.12)
- i18n (~> 0.6)
+ activeresource (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ activesupport (3.2.13)
+ i18n (= 0.6.1)
multi_json (~> 1.0)
acts_as_indexed (0.7.8)
arel (3.0.2)
awesome_nested_set (2.1.6)
activerecord (>= 3.0.0)
- babosa (0.3.9)
+ babosa (0.3.10)
bcrypt-ruby (3.0.1)
builder (3.0.4)
capistrano (2.14.2)
@@ -47,7 +47,7 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.6.1)
+ coffee-script-source (1.6.2)
devise (2.0.5)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
@@ -64,26 +64,26 @@ GEM
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
paper_trail (~> 2)
- highline (1.6.15)
- hike (1.2.1)
- i18n (0.6.4)
+ highline (1.6.18)
+ hike (1.2.2)
+ i18n (0.6.1)
journey (1.0.4)
jquery-rails (2.0.3)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.7)
- mail (2.4.4)
+ mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.21)
- multi_json (1.6.1)
+ mime-types (1.22)
+ multi_json (1.7.2)
mysql2 (0.3.11)
net-scp (1.1.0)
net-ssh (>= 2.6.5)
net-sftp (2.1.1)
net-ssh (>= 2.6.5)
- net-ssh (2.6.6)
+ net-ssh (2.6.7)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
orm_adapter (0.0.7)
@@ -98,22 +98,22 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.12)
- actionmailer (= 3.2.12)
- actionpack (= 3.2.12)
- activerecord (= 3.2.12)
- activeresource (= 3.2.12)
- activesupport (= 3.2.12)
+ rails (3.2.13)
+ actionmailer (= 3.2.13)
+ actionpack (= 3.2.13)
+ activerecord (= 3.2.13)
+ activeresource (= 3.2.13)
+ activesupport (= 3.2.13)
bundler (~> 1.0)
- railties (= 3.2.12)
- railties (3.2.12)
- actionpack (= 3.2.12)
- activesupport (= 3.2.12)
+ railties (= 3.2.13)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.0.3)
+ rake (10.0.4)
rdoc (3.12.2)
json (~> 1.4)
refinerycms (2.0.10)
@@ -160,7 +160,7 @@ GEM
refinerycms-core (= 2.0.10)
routing-filter (0.3.1)
actionpack
- rvm-capistrano (1.2.7)
+ rvm-capistrano (1.3.0)
capistrano (>= 2.0.0)
sass (3.2.7)
sass-rails (3.2.6)
@@ -175,14 +175,14 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
- thor (0.17.0)
- tilt (1.3.5)
+ thor (0.18.1)
+ tilt (1.3.7)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
truncate_html (0.5.5)
tzinfo (0.3.37)
- uglifier (1.3.0)
+ uglifier (2.0.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
warden (1.1.1)
@@ -194,13 +194,13 @@ PLATFORMS
DEPENDENCIES
capistrano
- coffee-rails (~> 3.2.1)
+ coffee-rails (~> 3.2)
jquery-rails (~> 2.0.0)
mysql2
rails (~> 3.2)
refinerycms (~> 2.0.0)
refinerycms-i18n (~> 2.0.0)
rvm-capistrano
- sass-rails (~> 3.2.3)
+ sass-rails (~> 3.2)
sqlite3
uglifier (>= 1.0.3)