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

Update to Rails 4.0 #174

Open
wants to merge 20 commits into
base: development
Choose a base branch
from
Open

Update to Rails 4.0 #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0ae3d77
Removing unneeded folders
rylanb Feb 24, 2019
c84276e
Renaming to remove `.css` from filenames and updating import ** to in…
rylanb Feb 24, 2019
100559c
Updating to new hash syntax
rylanb Feb 24, 2019
9781692
Updating to `data: { confirm …}` instead of `confirm:
rylanb Feb 24, 2019
c566ec3
Renaming css.scss to .scss
rylanb Feb 24, 2019
db89bb3
Bin file updates / Add best on my best guesses.
rylanb Feb 24, 2019
6147f4f
Updating to Factory Bot
rylanb Feb 24, 2019
8981012
Updating to dynamic attrs for deprecation coming in FactoryBot
rylanb Feb 24, 2019
7d33bf6
Updating to FactoryBot in rails helper
rylanb Feb 24, 2019
9dbd389
Syntax update for hash
rylanb Feb 24, 2019
aa8fba1
Adding schedule spec start.
rylanb Feb 24, 2019
db83689
Updating to js cookie from jQuery cookie
rylanb Feb 24, 2019
1b2f930
Removing coffee rails as its not used in the app
rylanb Feb 24, 2019
83faf46
Updating to Rails 4 and adding `protected_attributes` gem for now to …
rylanb Feb 24, 2019
4cb1cee
Switching to Puma for app server.
rylanb Feb 24, 2019
edff7c6
Updating all gems now to Rails 4.0 supported versions.
rylanb Feb 24, 2019
3a0a29a
Config updates based on deprecation warnings.
rylanb Feb 24, 2019
2bae85b
Re-arranging and cleaning up app controller
rylanb Feb 24, 2019
66f681f
Adding some eager loading / code cleanup
rylanb Feb 24, 2019
9895afd
Adding clean-up of `conditions` on associations to use `where` with `…
rylanb Feb 24, 2019
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
27 changes: 12 additions & 15 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,17 @@ ruby File.read('.ruby-version').strip

# the base rails libraries
gem 'pg', '~> 0.21.0'
gem 'rails', '~> 3.2.16'
gem 'rails', '~> 4.0.13'
gem 'rails_12factor'
gem 'thin'
gem 'puma'

# for handling json objects with ruby
gem 'json'

gem 'bootstrap-sass', '~> 3.2.0'
gem 'coffee-rails', '~> 3.2.1'
gem 'protected_attributes'
gem 'bootstrap-sass', '~> 3.4.0'
gem 'font-awesome-sass', '~> 4.4.0'
gem 'jquery-rails', '2.1.4'
gem 'sass-rails', '~> 3.2.6'
gem 'sass-rails', '~> 5.0'
gem 'simple_form'
gem 'therubyracer', platforms: :ruby
gem 'twitter-bootstrap-rails'
Expand Down Expand Up @@ -46,17 +45,14 @@ end
group :test do
gem 'capybara'
gem 'capybara-screenshot'
gem 'factory_girl_rails'
gem 'factory_bot_rails'
gem 'poltergeist', '~> 1.12'
gem 'rack-test'
gem 'rspec-rails', '~> 3.5'
end
# Temporary fix: https://stackoverflow.com/questions/13828889/rails-3-heroku-cannot-load-such-file-test-unit-testcase-loaderror
# Remove after upgrade of Rails from 3.2 is complete.
gem 'test-unit', '~> 3.0'

# dynamic in-place editing for some admin tables
gem 'active_scaffold'
gem 'active_scaffold', '~> 3.4.43'

# handles authentication
gem 'devise', '~> 3.2.0'
Expand All @@ -71,7 +67,7 @@ gem 'paperclip', git: 'https://github.com/thoughtbot/paperclip',
ref: '523bd46c768226893f23889079a7aa9c73b57d68'

# generate pdfs
gem 'prawn', '~> 2.1.0'
gem 'prawn', '~> 2.2.0'
gem 'prawn-table', '~> 0.2.2'

# used to geo-locate locations
Expand All @@ -89,12 +85,13 @@ gem 'jquery-datatables-rails', git: 'https://github.com/rweng/jquery-datatables-
gem 'cocoon'

# set timezone to browser timezone
gem 'browser-timezone-rails', '~> 0.2.00'
gem 'browser-timezone-rails', '~> 1.0'
gem 'js_cookie_rails'
gem 'ranked-model'

# Send email when exception occurs.
gem 'exception_notification', '~> 3.0.1'
gem 'exception_notification-rake', '~> 0.0.6'
gem 'exception_notification', '~> 4.0.1'
gem 'exception_notification-rake', '~> 0.1.3'

gem 'cancancan', '~> 1.15.0'
gem 'interactor'
Expand Down
Loading