Updated ruby,rails base versions

Workman · Sep 21, 2016 · 8aa9352 · 8aa9352
1 parent fe4dbb1
commit 8aa9352
Show file tree

Hide file tree

Showing 89 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,9 @@
 #source 'https://code.stripe.com'
 source 'https://rubygems.org'
 
-ruby '2.0.0'
+ruby '2.2.0'
 
-gem 'rails', '4.0.0'
+gem 'rails', '4.2.1'
 gem 'pg'
 gem 'sass-rails', '~> 4.0.0'
 gem 'uglifier', '>= 1.3.0'

diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/Procfile b/Procfile
diff --git a/README.md b/README.md
diff --git a/Rakefile b/Rakefile
diff --git a/TODO.md b/TODO.md
diff --git a/app/assets/fonts/glyphicons-halflings-regular.eot b/app/assets/fonts/glyphicons-halflings-regular.eot
diff --git a/app/assets/fonts/glyphicons-halflings-regular.svg b/app/assets/fonts/glyphicons-halflings-regular.svg
diff --git a/app/assets/fonts/glyphicons-halflings-regular.ttf b/app/assets/fonts/glyphicons-halflings-regular.ttf
diff --git a/app/assets/fonts/glyphicons-halflings-regular.woff b/app/assets/fonts/glyphicons-halflings-regular.woff
diff --git a/app/assets/images/.keep b/app/assets/images/.keep
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
diff --git a/app/assets/javascripts/bootstrap.js b/app/assets/javascripts/bootstrap.js
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
diff --git a/app/assets/stylesheets/bootstrap-theme.css b/app/assets/stylesheets/bootstrap-theme.css
diff --git a/app/assets/stylesheets/bootstrap.css.erb b/app/assets/stylesheets/bootstrap.css.erb
diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
diff --git a/app/controllers/authenticated_controller.rb b/app/controllers/authenticated_controller.rb
diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
diff --git a/app/helpers/badge_label_helper.rb b/app/helpers/badge_label_helper.rb
diff --git a/app/helpers/bootstrap_flash_helper.rb b/app/helpers/bootstrap_flash_helper.rb
diff --git a/app/helpers/flash_block_helper.rb b/app/helpers/flash_block_helper.rb
diff --git a/app/helpers/glyph_helper.rb b/app/helpers/glyph_helper.rb
diff --git a/app/helpers/modal_helper.rb b/app/helpers/modal_helper.rb
diff --git a/app/helpers/navbar_helper.rb b/app/helpers/navbar_helper.rb
diff --git a/app/mailers/.keep b/app/mailers/.keep
diff --git a/app/models/.keep b/app/models/.keep
diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep
diff --git a/app/models/user.rb b/app/models/user.rb
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb
diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
diff --git a/config.ru b/config.ru
diff --git a/config/application.rb b/config/application.rb
diff --git a/config/boot.rb b/config/boot.rb
diff --git a/config/database.yml b/config/database.yml
diff --git a/config/environment.rb b/config/environment.rb
diff --git a/config/environments/development.rb b/config/environments/development.rb
diff --git a/config/environments/production.rb b/config/environments/production.rb
diff --git a/config/environments/test.rb b/config/environments/test.rb
diff --git a/config/initializers/aws.rb b/config/initializers/aws.rb
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml
diff --git a/config/locales/en.yml b/config/locales/en.yml
diff --git a/config/routes.rb b/config/routes.rb
diff --git a/config/unicorn.rb b/config/unicorn.rb
diff --git a/db/migrate/20131120002044_devise_create_users.rb b/db/migrate/20131120002044_devise_create_users.rb
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/db/seeds.rb b/db/seeds.rb
diff --git a/lib/assets/.keep b/lib/assets/.keep
diff --git a/lib/tasks/.keep b/lib/tasks/.keep
diff --git a/public/404.html b/public/404.html
diff --git a/public/422.html b/public/422.html
diff --git a/public/500.html b/public/500.html
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/test/controllers/.keep b/test/controllers/.keep
diff --git a/test/fixtures/.keep b/test/fixtures/.keep
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
diff --git a/test/helpers/.keep b/test/helpers/.keep
diff --git a/test/integration/.keep b/test/integration/.keep
diff --git a/test/mailers/.keep b/test/mailers/.keep
diff --git a/test/models/.keep b/test/models/.keep
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
diff --git a/vendor/assets/javascripts/.keep b/vendor/assets/javascripts/.keep
diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep