Merge branch 'release/v16.1'

* release/v16.1: update gems #2. with fix capistrano
kaize · Jan 21, 2013 · 94dfec9 · 94dfec9
2 parents b65c4d9 + 3331b33
commit 94dfec9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -33,6 +33,7 @@ gem "gon"
 group :assets do
   gem 'jquery-ui-rails'
   gem 'sass-rails'
+  gem 'less-rails'
   gem 'coffee-rails'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -68,6 +68,7 @@ GEM
       execjs
     coffee-script-source (1.4.0)
     colorize (0.5.8)
+    commonjs (0.2.6)
     configus (0.0.4)
       rake
     connection_pool (1.0.0)
@@ -115,6 +116,11 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kgio (2.8.0)
+    less (2.2.2)
+      commonjs (~> 0.2.6)
+    less-rails (2.2.6)
+      actionpack (>= 3.1)
+      less (~> 2.2.0)
     libv8 (3.11.8.13)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -266,6 +272,7 @@ DEPENDENCIES
   jquery-rails
   jquery-ui-rails
   kaminari
+  less-rails
   meta_search
   mini_magick
   minitest

diff --git a/config/deploy/production.rb b/config/deploy/production.rb
@@ -1,4 +1,4 @@
-set :rails_env, :production
+set :rails_env, 'production'
 set :branch do
   raise "Use tags: TAG=v2" unless ENV['TAG']
   ENV['TAG']

diff --git a/config/deploy/staging.rb b/config/deploy/staging.rb
@@ -1,4 +1,4 @@
-set :rails_env, :staging
+set :rails_env, 'staging'
 set :branch, 'develop'
 set :user, 'deadline_camp_staging'
 set :keep_releases, 5