Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated Gemfile and tokens

  • Loading branch information...
commit 02acf5e35f13d18b06cdca2ab62a61b245efdc0d 1 parent 0d89079
@sqctest02 sqctest02 authored
View
18 Gemfile
@@ -2,9 +2,9 @@ source 'https://rubygems.org'
gem 'rake'
-gem 'rails', '~> 3.2.13.rc1'
-### gem 'rails', '4.0.0.beta1'
-### gem 'protected_attributes' # Rails 4.0 (instead of strong_params)
+#### gem 'rails', '~> 3.2.13.rc1'
+gem 'rails', '4.0.0.beta1'
+gem 'protected_attributes' # Rails 4.0 (instead of strong_params)
gem 'rack'
@@ -16,8 +16,8 @@ gem 'will_paginate'
# Asset template engines
-### gem 'sass-rails', '4.0.0.beta1' #4.0:
-gem 'sass-rails'
+gem 'sass-rails', '4.0.0.beta1' #4.0:
+### gem 'sass-rails'
gem 'coffee-script'
gem 'uglifier'
@@ -37,7 +37,7 @@ group :production do
end
group :development do
- gem 'rspec-rails'
+ gem "rspec-rails", "~> 2.13.0"
gem 'annotate'
gem 'faker'
end
@@ -45,12 +45,12 @@ end
gem 'holepicker'
group :test do
- gem 'rspec-rails'
- gem 'webrat'
gem 'spork-rails', :git => 'https://github.com/sahilm/spork-rails.git', :branch => 'rails-4'
-
+ gem "rspec-rails", "~> 2.13.0"
gem 'factory_girl_rails'
+ gem 'webrat'
+
# Pretty printed test output
gem 'turn', :require => false
end
View
119 Gemfile.lock
@@ -9,42 +9,40 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.13.rc1)
- actionpack (= 3.2.13.rc1)
+ actionmailer (4.0.0.beta1)
+ actionpack (= 4.0.0.beta1)
mail (~> 2.5.3)
- actionpack (3.2.13.rc1)
- activemodel (= 3.2.13.rc1)
- activesupport (= 3.2.13.rc1)
- builder (~> 3.0.0)
+ actionpack (4.0.0.beta1)
+ activesupport (= 4.0.0.beta1)
+ builder (~> 3.1.0)
erubis (~> 2.7.0)
- journey (~> 1.0.4)
- rack (~> 1.4.5)
- rack-cache (~> 1.2)
- rack-test (~> 0.6.1)
- sprockets (~> 2.2.1)
- activemodel (3.2.13.rc1)
- activesupport (= 3.2.13.rc1)
- builder (~> 3.0.0)
- activerecord (3.2.13.rc1)
- activemodel (= 3.2.13.rc1)
- activesupport (= 3.2.13.rc1)
- arel (~> 3.0.2)
- tzinfo (~> 0.3.29)
- activeresource (3.2.13.rc1)
- activemodel (= 3.2.13.rc1)
- activesupport (= 3.2.13.rc1)
- activesupport (3.2.13.rc1)
- i18n (= 0.6.1)
- multi_json (~> 1.0)
+ rack (~> 1.5.2)
+ rack-test (~> 0.6.2)
+ activemodel (4.0.0.beta1)
+ activesupport (= 4.0.0.beta1)
+ builder (~> 3.1.0)
+ activerecord (4.0.0.beta1)
+ activemodel (= 4.0.0.beta1)
+ activerecord-deprecated_finders (~> 0.0.3)
+ activesupport (= 4.0.0.beta1)
+ arel (~> 4.0.0.beta1)
+ activerecord-deprecated_finders (0.0.3)
+ activesupport (4.0.0.beta1)
+ i18n (~> 0.6.2)
+ minitest (~> 4.2)
+ multi_json (~> 1.3)
+ thread_safe (~> 0.1)
+ tzinfo (~> 0.3.33)
annotate (2.5.0)
rake
ansi (1.4.3)
- arel (3.0.2)
- builder (3.0.4)
+ arel (4.0.0.beta1)
+ atomic (1.0.1)
+ builder (3.1.4)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.5.0)
+ coffee-script-source (1.6.1)
diff-lcs (1.2.1)
erubis (2.7.0)
execjs (1.4.0)
@@ -58,11 +56,10 @@ GEM
i18n (~> 0.5)
gravatar_image_tag (1.1.3)
hike (1.2.1)
- holepicker (0.1.2)
+ holepicker (0.2.0)
json (>= 1.7.7)
rainbow (>= 1.1.4)
- i18n (0.6.1)
- journey (1.0.4)
+ i18n (0.6.4)
jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
@@ -72,33 +69,31 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.21)
+ minitest (4.6.2)
multi_json (1.6.1)
nokogiri (1.5.6)
pg (0.14.1)
polyglot (0.3.3)
+ protected_attributes (1.0.0)
+ activemodel (>= 4.0.0.beta, < 5.0)
psych (2.0.0)
- rack (1.4.5)
- rack-cache (1.2)
- rack (>= 0.4)
- rack-ssl (1.3.3)
- rack
+ rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.13.rc1)
- actionmailer (= 3.2.13.rc1)
- actionpack (= 3.2.13.rc1)
- activerecord (= 3.2.13.rc1)
- activeresource (= 3.2.13.rc1)
- activesupport (= 3.2.13.rc1)
- bundler (~> 1.0)
- railties (= 3.2.13.rc1)
- railties (3.2.13.rc1)
- actionpack (= 3.2.13.rc1)
- activesupport (= 3.2.13.rc1)
- rack-ssl (~> 1.3.2)
+ rails (4.0.0.beta1)
+ actionmailer (= 4.0.0.beta1)
+ actionpack (= 4.0.0.beta1)
+ activerecord (= 4.0.0.beta1)
+ activesupport (= 4.0.0.beta1)
+ bundler (>= 1.3.0, < 2.0)
+ railties (= 4.0.0.beta1)
+ sprockets-rails (~> 2.0.0.rc3)
+ railties (4.0.0.beta1)
+ actionpack (= 4.0.0.beta1)
+ activesupport (= 4.0.0.beta1)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (>= 0.14.6, < 2.0)
+ thor (>= 0.17.0, < 2.0)
rainbow (1.1.4)
rake (10.0.3)
rdoc (3.12.2)
@@ -114,25 +109,32 @@ GEM
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
- sass (3.2.6)
- sass-rails (3.2.6)
- railties (~> 3.2.0)
+ sass (3.2.7)
+ sass-rails (4.0.0.beta1)
+ railties (>= 4.0.0.beta, < 5.0)
sass (>= 3.1.10)
+ sprockets-rails (~> 2.0.0.rc0)
tilt (~> 1.3)
spork (1.0.0rc3)
- sprockets (2.2.2)
+ sprockets (2.9.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
+ sprockets-rails (2.0.0.rc3)
+ actionpack (>= 3.0)
+ activesupport (>= 3.0)
+ sprockets (~> 2.8)
thor (0.17.0)
- tilt (1.3.4)
+ thread_safe (0.1.0)
+ atomic
+ tilt (1.3.5)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
turn (0.9.6)
ansi
- tzinfo (0.3.35)
+ tzinfo (0.3.36)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@ -156,12 +158,13 @@ DEPENDENCIES
json
nokogiri
pg
+ protected_attributes
psych
rack
- rails (~> 3.2.13.rc1)
+ rails (= 4.0.0.beta1)
rake
- rspec-rails
- sass-rails
+ rspec-rails (~> 2.13.0)
+ sass-rails (= 4.0.0.beta1)
spork-rails!
turn
uglifier
View
3  config/initializers/secret_token.rb
@@ -9,4 +9,5 @@
SampleApp31::Application.config.secret_token = 'd067c5ec2f38b4130e27d15561fbec8babae0b4a2b6a2c18839b4ea168db2bb701a1f0e541efa1d2fd630488fa3a9b271d2eff6c202cadfb62a5af0ce228da81'
### RAILS 4.0:
-### SampleApp31::Application.config.secret_key_base = 'd067c5ec2f38b4130e27d15561fbec8babae0b4a2b6a2c18839b4ea168db2bb701a1f0e541efa1d2fd630488fa3a9b271d2eff6c202cadfb62a5af0ce228da81'
+###
+SampleApp31::Application.config.secret_key_base = 'd067c5ec2f38b4130e27d15561fbec8babae0b4a2b6a2c18839b4ea168db2bb701a1f0e541efa1d2fd630488fa3a9b271d2eff6c202cadfb62a5af0ce228da81'
View
6 config/initializers/session_store.rb
@@ -1,8 +1,8 @@
# Be sure to restart your server when you modify this file.
-# RAILS 4.0: SampleApp31::Application.config.session_store :upgrade_signature_to_encryption_cookie_store, key: '_sample_app_3_1_session'
-# Rails 3.2.x:
-SampleApp31::Application.config.session_store :cookie_store, key: '_sample_app_3_1_session'
+# RAILS 4.0:
+SampleApp31::Application.config.session_store :upgrade_signature_to_encryption_cookie_store, key: '_sample_app_3_1_session'
+# Rails 3.2.x: SampleApp31::Application.config.session_store :cookie_store, key: '_sample_app_3_1_session'
# Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information

0 comments on commit 02acf5e

Please sign in to comment.
Something went wrong with that request. Please try again.