Merge pull request #121 from zendesk/craig/gemfile-rename

Rename `Gemfile` to `gems.rb`
zendesk · Jun 12, 2018 · f0839fc · f0839fc
2 parents 6963770 + 7ea7c8d
commit f0839fc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 *.gem
 .bundle
-Gemfile.lock
+gems.locked
 pkg
 bin/
 coverage/
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -31,9 +31,5 @@ Style/BlockDelimiters:
 Style/Documentation:
   Enabled: false
 
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    default: '[]'
-
 Style/SignalException:
   EnforcedStyle: semantic
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,8 @@ rvm:
 
 cache: bundler
 
-bundler_args: --without benchmark development
+gemfile: gems.rb
 
-before_install: gem update --system
+bundler_args: --without benchmark development
 
 after_success: bundle exec codeclimate-test-reporter
diff --git a/Gemfile → gems.rb b/Gemfile → gems.rb
@@ -17,7 +17,7 @@
 
 group :development do
   gem 'bump',    '~> 0.6.0', require: false
-  gem 'bundler', '~> 1.0',   require: false
+  gem 'bundler', '~> 1.8',   require: false
 end
 
 group :ci, :development do