Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rails5 #187

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
+386 −232
Open

Rails5 #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6c4e856
update ruby from 2.2.2 to 2.3.0
Chocksy Jul 6, 2016
a179436
update gems and rails to v5
Chocksy Jul 6, 2016
ac1f9c1
change before_filter to before_action
Chocksy Jul 6, 2016
443a37b
render nothing does not work we need to call head :ok
Chocksy Jul 6, 2016
3b1e651
activerecord 5 now uses distinct instead of uniq
Chocksy Jul 6, 2016
e76fe40
update controller requests to a hash format
Chocksy Jul 6, 2016
162f7ff
update core rails files to their rails 5 versions
Chocksy Jul 6, 2016
a9df873
returning false on model callbaks does not stop the chain we need to …
Chocksy Jul 6, 2016
f9cc263
update passenger status service agent
Chocksy Jul 6, 2016
5673c7c
update auth_helper to use the hash format for process
Chocksy Jul 6, 2016
2f4601d
enumerize supports rails 5 now, and friendly_id uses the master branch
Chocksy Aug 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.2.2
ruby-2.3.0
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
rvm:
- 2.2.2
- 2.3.0
addons:
postgresql: "9.4"
cache: bundler
Expand Down
23 changes: 14 additions & 9 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,38 @@
source 'https://rubygems.org'

ruby '2.2.2'
ruby '2.3.0'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.6'
gem 'rails', '5.0.0'
# Use postgres as the database for Active Record
gem 'pg'
gem 'schema_plus_pg_indexes'
gem 'schema_plus_foreign_keys'
gem 'schema_plus_core', github: 'SchemaPlus/schema_plus_core', branch: 'activerecord-5.0'
# gem 'schema_plus_foreign_keys', github: 'SchemaPlus/schema_plus_foreign_keys', branch: 'activerecord-5.0'
# Add enumerize gem
gem 'enumerize'

# Use bootstrap
gem 'bootstrap-sass', '~> 3.3.6'
gem 'font-awesome-sass'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0.1'
gem 'sass-rails' #, '~> 5.0.1'
# Sprokets
gem 'sprockets-rails'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
gem 'uglifier' #, '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.2.1'
gem 'coffee-rails' #, '~> 4.1.0'
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby
gem 'haml-rails'

# jquery form validation plugin
gem 'jquery-validation-rails'
gem 'activeadmin', '~> 1.0.0.pre4'
gem 'activeadmin', github: 'activeadmin'
# TODO remove these once activeamdin is rails 5 ready
# activeadmin dependencies that have rails 5 support
gem 'inherited_resources', github: 'activeadmin/inherited_resources'
# END depedencies

# Use jquery as the JavaScript library
gem 'jquery-rails'
Expand Down Expand Up @@ -74,7 +78,7 @@ gem 'useragent'
gem 'addressable'

#better urls
gem 'friendly_id', '~> 5.1.0'
gem 'friendly_id', github: 'norman/friendly_id'

#group objects by time frames
gem 'groupdate'
Expand All @@ -99,6 +103,7 @@ group :test do
gem 'timecop'
gem 'shoulda-matchers', require: false
gem 'codecov', require: false
gem 'rails-controller-testing'
end

group :development, :test do
Expand Down
Loading