Skip to content

Commit 25f0c98

Browse files
authored
[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
1 parent c5227d5 commit 25f0c98

File tree

5 files changed

+6
-59
lines changed

5 files changed

+6
-59
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@
44
/spec/reports/
55
/tmp/
66
.DS_Store
7+
8+
# Gemfile.lock should not be under version control
9+
# https://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
10+
Gemfile.lock

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
99
### Changed
1010

1111
### Removed
12+
- Removed `Gemfile.lock` from source control
1213

1314
## [v0.5.1](https://github.com/bugcrowd/vrt-ruby/compare/v0.5.0...v0.5.1) - 2018-05-15
1415
### Changed

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
FROM ruby:2.3-alpine
22

3-
# throw errors if Gemfile has been modified since Gemfile.lock
4-
RUN bundle config --global frozen 1
5-
63
RUN mkdir -p /usr/src/app
74
WORKDIR /usr/src/app
85

Gemfile.lock

Lines changed: 0 additions & 55 deletions
This file was deleted.

vrt.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
2121
spec.add_development_dependency 'bundler', '~> 1.14'
2222
spec.add_development_dependency 'rake'
2323
spec.add_development_dependency 'rspec'
24-
spec.add_development_dependency 'rubocop', '~> 0.48'
24+
spec.add_development_dependency 'rubocop', '0.48.1'
2525
spec.add_development_dependency 'pry'
2626
end

0 commit comments

Comments
 (0)