From a11ab12cd8c8e7e70897560f80d4d075aa0ce59e Mon Sep 17 00:00:00 2001 From: Dan Elbert Date: Thu, 13 Apr 2017 12:08:29 -0500 Subject: [PATCH] gem update; cleanup --- Gemfile | 9 ++------- Gemfile.lock | 23 ++++++----------------- app/.DS_Store | Bin 6148 -> 0 bytes app/assets/.DS_Store | Bin 6148 -> 0 bytes app/assets/images/.DS_Store | Bin 6148 -> 0 bytes 5 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 app/.DS_Store delete mode 100644 app/assets/.DS_Store delete mode 100644 app/assets/images/.DS_Store diff --git a/Gemfile b/Gemfile index 7d15567..8743f0f 100644 --- a/Gemfile +++ b/Gemfile @@ -30,14 +30,9 @@ group :development, :test do gem 'guard-rspec', require: false gem 'rspec-rails', '~> 3.5.0' gem 'rails-controller-testing' - gem 'factory_girl_rails', '~> 4.7.0' + gem 'factory_girl_rails', '~> 4.8.0' gem 'database_cleaner', '~> 1.5.3' - # Call 'byebug' anywhere in the code to stop execution and get a debugger console - gem 'byebug' end -group :development do - # Access an IRB console on exception pages or by using <%= console %> in views - gem 'web-console', '~> 3.3.1' -end + diff --git a/Gemfile.lock b/Gemfile.lock index 88b48b9..b4c0477 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,24 +42,21 @@ GEM autoprefixer-rails (6.7.7.1) execjs bcrypt (3.1.11) - blankslate (3.1.3) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) builder (3.2.3) - byebug (9.0.6) cocoon (1.2.9) coderay (1.1.1) concurrent-ruby (1.0.5) database_cleaner (1.5.3) - debug_inspector (0.0.2) diff-lcs (1.3) erubis (2.7.0) execjs (2.7.0) - factory_girl (4.7.0) + factory_girl (4.8.0) activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) + factory_girl_rails (4.8.0) + factory_girl (~> 4.8.0) railties (>= 3.0.0) ffi (1.9.18) formatador (0.2.5) @@ -126,8 +123,7 @@ GEM notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) - parslet (1.7.1) - blankslate (>= 2.0, <= 4.0) + parslet (1.8.0) pg (0.20.0) pry (0.10.4) coderay (~> 1.1.0) @@ -220,18 +216,13 @@ GEM turbolinks-source (5.0.0) tzinfo (1.2.3) thread_safe (~> 0.1) - uglifier (3.1.11) + uglifier (3.2.0) execjs (>= 0.3.0, < 3) unitwise (2.0.0) liner (~> 0.2) memoizable (~> 0.4) parslet (~> 1.5) signed_multiset (~> 0.2) - web-console (3.3.1) - actionview (>= 5.0) - activemodel (>= 5.0) - debug_inspector - railties (>= 5.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -242,10 +233,9 @@ PLATFORMS DEPENDENCIES bcrypt (~> 3.1.11) bootstrap-sass (~> 3.3.7) - byebug cocoon (~> 1.2.9) database_cleaner (~> 1.5.3) - factory_girl_rails (~> 4.7.0) + factory_girl_rails (~> 4.8.0) guard (~> 2.14.0) guard-rspec jbuilder (~> 2.6) @@ -262,7 +252,6 @@ DEPENDENCIES turbolinks (~> 5.0.1) uglifier (>= 1.3.0) unitwise (~> 2.0.0) - web-console (~> 3.3.1) BUNDLED WITH 1.14.6 diff --git a/app/.DS_Store b/app/.DS_Store deleted file mode 100644 index c32883842752acf742ff9e4a68f0123bb24f31f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKISv9b4733uBpOP}e1RWC2wuPkI6EYYg?=mE#nTuc1!$pz0yJJZlQ^ENc8Yi{ zB09h9XCf038Nm(ZYD3p--@IeJj3^L}GtScNo857HIvqRNuLH&%%0?PIhey6`(5L_v zpaN8Y3Q&QME0862H2(O>Jdg@dfnQg^?uP<5tch))UmX~{1pp2ZcEj9z31G1RuqL*F zh`==`Eo-SGgIZ^>C@T@>TmJ_T0OZc1q z|Cz)U6`%rtrGO3=tHm6jl(n_@%A`)&zQ{^vp^9GWoZ5&*pIp* z1>-3Kay3TCQh%Bb{V4HQqRFw24B*;rFv-3#kM-H|`aS!@NTyk%@x%+o(wmJj)U~f)#IJWARF}T?d~X?Kx)^E!(*9BUq&*!u*!J#?AmPB+S{*-=6+*d7qeEY zQ5PTfTJyPmXIVSD&5xfx59gQPfBd|hp};os|j6+{g&Kn%Q226(CCcG@sEbGEL`63!v4+#ATC>p3C2L34nzX0K7Yi|Gm diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store deleted file mode 100644 index 2bd76266fd02c59c7051458a07e2f5ccaea67105..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOG*SW5UtVy2i(lkW$*@bgD|uwmqrS)ve?&Wy2pcIYI?3!vH@t@QHrc(>lR{mevvv5R{@lUuow z7kQA;{&)M)cE2!oebaP@=T_wHwZAmp5u^KtvA?HElT}6wrke_+0;xbMkP7^m0=Tnj z%X7!9Q-M?<75G$u=R-ju*1*Bhjt*3o0s#4pHiOSxf-xnq1`duGfvJZAJyavbP!C6c z30@5x96ek#k`IlQKav-<)iHlDx@dLGIu%F-rV5;TbH)4r3ct*3l0OZ}Rw|GR{4)h~ z(QKOyJ}U0kqtD}ATTrf1XygraVDKl805o`xT-czG7y97Uz`>ETu;0Rg`4BKcvPuPh GL4kLT?kXMt