[CHORE] Gemfile.lock out of version control (#27)

* Gemfile.lock out of version control * Can't force the Gemfile.lock to be frozen as it will be regenerated each time * Pin Rubocop * Add note to changelog
bugcrowd · May 16, 2018 · 25f0c98 · 25f0c98
1 parent c5227d5
commit 25f0c98
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 59 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,7 @@
 /spec/reports/
 /tmp/
 .DS_Store
+
+# Gemfile.lock should not be under version control
+# https://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
+Gemfile.lock
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ### Changed
 
 ### Removed
+- Removed `Gemfile.lock` from source control
 
 ## [v0.5.1](https://github.com/bugcrowd/vrt-ruby/compare/v0.5.0...v0.5.1) - 2018-05-15
 ### Changed

diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,5 @@
 FROM ruby:2.3-alpine
 
-# throw errors if Gemfile has been modified since Gemfile.lock
-RUN bundle config --global frozen 1
-
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 

diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/vrt.gemspec b/vrt.gemspec
@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop', '~> 0.48'
+  spec.add_development_dependency 'rubocop', '0.48.1'
   spec.add_development_dependency 'pry'
 end