Merge remote-tracking branch 'upstream/master'

yammer · Sep 12, 2016 · cf71d08 · cf71d08
2 parents 6546d34 + fe1c905
commit cf71d08
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,9 @@
 language: ruby
+install:
+- bundle install --without interactive
 rvm:
   - "1.9.3"
-  - "2.1.7"
-  - "2.2.3"
-  - "jruby-9.0.0.0"
+  - "2.1.10"
+  - "2.2.5"
+  - "2.3.1"
+  - "jruby-9.1.5.0"
diff --git a/Gemfile b/Gemfile
@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in model_attribute.gemspec
 gemspec
+
+group 'interactive' do
+  gem 'rspec-nc'
+  gem 'guard'
+  gem 'guard-rspec'
+end
diff --git a/README.md b/README.md
@@ -215,3 +215,12 @@ Or install it yourself as:
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+## Code of Conduct
+
+This project has adopted the [Microsoft Open Source Code of
+Conduct](https://opensource.microsoft.com/codeofconduct/). For more information
+see the [Code of Conduct
+FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact
+[opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional
+questions or comments.
diff --git a/model_attribute.gemspec b/model_attribute.gemspec
@@ -24,7 +24,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler",         "~> 1.7"
   spec.add_development_dependency "rake",            "~> 10.0"
   spec.add_development_dependency "rspec",           "~> 3.1"
-  spec.add_development_dependency "rspec-nc",        "~> 0.3"
-  spec.add_development_dependency "guard",           "~> 2.8"
-  spec.add_development_dependency "guard-rspec",     "~> 4.3"
 end