Skip to content

Commit

Permalink
Merge pull request harrystech#39 from phamdt/wardpenneyrails4
Browse files Browse the repository at this point in the history
rails 4 courtesy of Wardpenney
  • Loading branch information
Ilya Rubnich committed Mar 15, 2016
2 parents 6c7febd + cc07186 commit 9c52d16
Show file tree
Hide file tree
Showing 44 changed files with 457 additions and 390 deletions.
3 changes: 3 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
DEFAULT_MAILER_HOST="localhost:3000"
SECRET_KEY_BASE="xxxxxxxx-change-me-please-xxxxxxxx"
CAMPAIGN_ENDED=false
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ config/secrets.yml

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc
# Ignore the default database config
config/database.yml

# Ignore all logfiles and tempfiles.
/lib/assets/*.csv

# if using bower-rails ignore default bower_components path bower.json files
/vendor/assets/bower_components
Expand All @@ -39,3 +44,5 @@ bower.json
/lib/assets/*.csv
.DS_Store
.elasticbeanstalk

/.env
32 changes: 15 additions & 17 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,30 @@ source 'https://rubygems.org'

ruby '2.3.0'

gem 'rails', '3.2.22.2'

gem 'activeadmin', '1.0.0.pre2'
gem 'delayed_job_active_record', '~> 4.0.3'
gem 'devise'
gem 'pg'
gem 'rails', '4.2.5.2'
gem 'unicorn'

gem 'activeadmin'

# 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'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', :platforms => :ruby

gem 'uglifier', '>= 1.0.3'
gem 'coffee-rails', '~> 4.1.0'
gem 'sass-rails', '~> 5.0.1'
gem 'uglifier'
end

group :development, :test do
gem 'pry'
# To use debugger
# gem 'debugger'
gem 'rspec-rails', '3.4.1'
gem 'rspec-rails', '3.4.2'
gem 'rspec-mocks', '3.4.1'
gem 'test-unit', '~> 3.0'
gem "dotenv-rails"
end

gem 'delayed_job_active_record'

gem 'unicorn'

# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'

Expand All @@ -44,3 +37,8 @@ gem 'unicorn'

# Deploy with Capistrano
# gem 'capistrano'

group :production do
gem 'rails_12factor'
gem 'rails_serve_static_assets'
end
Loading

0 comments on commit 9c52d16

Please sign in to comment.