diff --git a/Gemfile b/Gemfile index 556dadb4d..6872c8550 100755 --- a/Gemfile +++ b/Gemfile @@ -4,16 +4,9 @@ ruby "2.4.1" gem "rails", "~> 5.1.3" gem "thin" gem "rails_12factor" -# START RAILS 5.1 "SPECIAL" VERSIONS ===================================.,_ -# TODO: Get off of this version once Devise folks ship a 5.1 release. -# - RC 12 May 17 -gem "devise", git: "https://github.com/plataformatec/devise" -gem 'delayed_job', git: 'https://github.com/gogovan/delayed_job', - branch: 'rails-5.1' -gem 'delayed_job_active_record', - git: 'https://github.com/gogovan/delayed_job_active_record', - branch: 'rails-5.1' -# END TEMPORARY RAILS 5.1 GEMS =========================================-"` +gem "devise" +gem "delayed_job" +gem "delayed_job_active_record" gem "jwt" gem "mutations" gem "active_model_serializers" @@ -34,7 +27,7 @@ gem "rollbar", "~> 2.15.0" gem "skylight" group :development, :test do - gem 'codecov', require: false + gem "codecov", require: false gem "database_cleaner" gem "pry" gem "factory_girl_rails" diff --git a/Gemfile.lock b/Gemfile.lock index b4244523c..95ed76cd0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,34 +13,6 @@ GIT fog-json fog-xml -GIT - remote: https://github.com/gogovan/delayed_job - revision: a2d73c4ddae7763ef5150aa340483dff02a284fa - branch: rails-5.1 - specs: - delayed_job (4.1.2) - activesupport (>= 3.0, < 5.2) - -GIT - remote: https://github.com/gogovan/delayed_job_active_record - revision: 3ca88883fe3881fda11174f03261e7e017bc7cf1 - branch: rails-5.1 - specs: - delayed_job_active_record (4.1.1) - activerecord (>= 3.0, < 5.2) - delayed_job (>= 3.0, < 5) - -GIT - remote: https://github.com/plataformatec/devise - revision: 5e014ab6072551f6c39c391340e6b2089c849d00 - specs: - devise (4.3.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 5.2) - responders - warden (~> 1.2.3) - GEM remote: https://rubygems.org/ specs: @@ -105,6 +77,17 @@ GEM concurrent-ruby (1.0.5) daemons (1.2.4) database_cleaner (1.6.1) + delayed_job (4.1.3) + activesupport (>= 3.0, < 5.2) + delayed_job_active_record (4.1.2) + activerecord (>= 3.0, < 5.2) + delayed_job (>= 3.0, < 5) + devise (4.3.0) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 5.2) + responders + warden (~> 1.2.3) diff-lcs (1.3) docile (1.1.5) erubi (1.6.1) @@ -280,9 +263,9 @@ DEPENDENCIES active_model_serializers codecov database_cleaner - delayed_job! - delayed_job_active_record! - devise! + delayed_job + delayed_job_active_record + devise factory_girl_rails faker figaro