Merge pull request #7 from simplybusiness/remove_gfl

Remove Gemfile.lock from source control
simplybusiness · Jan 25, 2016 · 82174c6 · 82174c6
2 parents 4c26e99 + b0eb2cd
commit 82174c6
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 205 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+*.gem
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
@@ -2,15 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in flip_fab.gemspec
 gemspec
-
-group :development, :test do
-  gem 'pry-plus'
-end
-
-group :test do
-  gem 'rack'
-  gem 'rack-test'
-  gem 'rspec'
-  gem 'rutabaga'
-  gem 'timecop'
-end
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/example/rails_app/Gemfile b/example/rails_app/Gemfile
@@ -1,15 +1,15 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.2.0'
+gem 'rails', '~> 4.2'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.3'
+gem 'sass-rails'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .js.coffee assets and views
-gem 'coffee-rails', '~> 4.0.0'
+gem 'coffee-rails'
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 # gem 'therubyracer',  platforms: :ruby