Skip to content

Commit

Permalink
Merge pull request #16 from fs/rails4
Browse files Browse the repository at this point in the history
Rails 4
  • Loading branch information
dmitrytrager committed Sep 24, 2013
2 parents 297d0f4 + 294ce19 commit 7beb9b8
Show file tree
Hide file tree
Showing 29 changed files with 400 additions and 265 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.9.3-p374
2.0.0-p247
5 changes: 5 additions & 0 deletions .simplecov
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
SimpleCov.start 'rails' do
add_filter 'api_taster'
add_filter 'examples'
add_filter 'serializers'
end
22 changes: 17 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
source 'https://rubygems.org'

gem 'rails', '3.2.12'
ruby '2.0.0'

gem 'rails', '4.0.0'

gem 'rails-api'

Expand All @@ -9,10 +11,9 @@ gem 'airbrake'
gem 'thin'
gem 'decent_exposure'
gem 'active_model_serializers'
gem 'seedbank'
gem 'seedbank', github: 'james2m/seedbank'
gem 'dotenv'
gem 'strong_parameters'
gem 'devise'
gem 'devise', '~> 3.1.0'

group :development do
gem 'letter_opener'
Expand Down Expand Up @@ -43,10 +44,21 @@ group :test do
end

group :development, :staging do
gem 'api_taster', git: '[email protected]:fredwu/api_taster.git'
gem 'api_taster', github: 'vast/api_taster', branch: 'rails4'
# gem 'api_taster', path: '../api_taster' # for local development
end

group :development, :test, :staging do
gem 'faker'
gem 'factory_girl_rails'
end

group :staging do
gem 'sass-rails'
gem 'uglifier'
gem 'coffee-rails'
end

group :staging, :production do
gem 'rails_12factor'
end
Loading

0 comments on commit 7beb9b8

Please sign in to comment.