Merge branch 'update-activesupport' into 'master'

Allow activesupport >= 4.0 and run tests on Rails 4.2 as well as Rails 5.0

Fixes #20. Required for eventual update to Rails 5.

See merge request !99

.gitlab-ci.yml

 image: ruby:2.1
-before_script:
-  - ./scripts/prepare_build.sh
-  - ruby -v
-  - gem install bundler --no-ri --no-rdoc
-  - bundle install -j $(nproc) --path vendor
-
 cache:
   paths:
     - vendor/ruby
-bundler:audit:
+.rails-42: &rails-42
+  before_script:
+    - ./scripts/prepare_build.sh
+    - ruby -v
+    - gem install bundler --no-ri --no-rdoc
+    - bundle install --gemfile=gemfiles/rails_42.gemfile -j $(nproc)
+
+.rails-50: &rails-50
+  before_script:
+    - ./scripts/prepare_build.sh
+    - ruby -v
+    - gem install bundler --no-ri --no-rdoc
+    - bundle install --gemfile=gemfiles/rails_50.gemfile -j $(nproc)
+
+rspec-ruby21-rails42:
+  <<: *rails-42
   script:
-    - "bundle exec bundle-audit check --update --ignore OSVDB-115941"
-rspec:
+    - bundle exec rspec spec
+rspec-ruby23-rails42:
+  image: ruby:2.3.1
+  <<: *rails-42
   script:
-  - bundle exec rspec spec
-rspec2.3:
+    - bundle exec rspec spec
+rspec-ruby23-rails50:
   image: ruby:2.3.1
+  <<: *rails-50
   script:
-  - bundle exec rspec spec
+    - bundle exec rspec spec
+
+.static-analysis: &static-analysis
+  image: ruby:2.3.1
+  before_script:
+    - ./scripts/prepare_build.sh
+    - ruby -v
+    - gem install bundler --no-ri --no-rdoc
+    - bundle install -j $(nproc)
 rubocop:
+  <<: *static-analysis
   script:
     - bundle exec rubocop
+
+bundler:audit:
+  <<: *static-analysis
+  script:
+    - "bundle exec bundle-audit check --update --ignore OSVDB-115941"

Appraisals

+appraise "rails-42" do
+  gem "activesupport", "~> 4.2.7"
+end
+
+appraise "rails-50" do
+  gem "activesupport", "~> 5.0.0"
+end

Gemfile

@@ -22,4 +22,5 @@ end
 group :development, :test do
   gem 'bundler-audit', '~> 0.5.0', require: false
+  gem "appraisal"
 end

Rakefile

 #!/usr/bin/env rake
-
+require "rubygems"
+require "bundler/setup"
 require "bundler/gem_tasks"

gemfiles/rails_42.gemfile

+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.2.7"
+
+group :development do
+  gem "rubocop"
+  gem "rubocop-rspec", "1.5.1"
+  gem "coveralls", :require => false
+  gem "rspec", "~> 3.0"
+  gem "rspec-mocks"
+  gem "rspec-its"
+  gem "webmock"
+  gem "guard"
+  gem "guard-rspec"
+  gem "pry"
+  gem "rake"
+end
+
+group :test do
+  gem "simplecov", :require => false
+end
+
+group :development, :test do
+  gem "bundler-audit", "~> 0.5.0", :require => false
+  gem "appraisal"
+end
+
+gemspec :path => "../"

gemfiles/rails_50.gemfile

+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.0.0"
+
+group :development do
+  gem "rubocop"
+  gem "rubocop-rspec", "1.5.1"
+  gem "coveralls", :require => false
+  gem "rspec", "~> 3.0"
+  gem "rspec-mocks"
+  gem "rspec-its"
+  gem "webmock"
+  gem "guard"
+  gem "guard-rspec"
+  gem "pry"
+  gem "rake"
+end
+
+group :test do
+  gem "simplecov", :require => false
+end
+
+group :development, :test do
+  gem "bundler-audit", "~> 0.5.0", :require => false
+  gem "appraisal"
+end
+
+gemspec :path => "../"

gitlab_git.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
     'https://gitlab.com/gitlab-org/gitlab_git'
   s.add_dependency("github-linguist", "~> 4.7.0")
-  s.add_dependency("activesupport", "~> 4.0")
+  s.add_dependency("activesupport", ">= 4.0")
   s.add_dependency("rugged", "~> 0.24.0")
   s.add_dependency("charlock_holmes", "~> 0.7.3")
   s.add_development_dependency("listen", "~> 3.0.6")