Skip to content

Commit

Permalink
Merge branch 'hotfix/5.4.1'
Browse files Browse the repository at this point in the history
* hotfix/5.4.1:
  Update version and changelog
  Fix Gemnasium badge
  Update Travis configuration
  Update RuboCop configuration
  Update development dependencies
  Update Appraisals
  • Loading branch information
tagliala committed Jun 1, 2017
2 parents 9e6bb1e + c37e387 commit 1ffa9a4
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 17 deletions.
8 changes: 0 additions & 8 deletions .rubocop.yml
Expand Up @@ -3,7 +3,6 @@ AllCops:
TargetRailsVersion: 5.0
TargetRubyVersion: 2.2
Exclude:
- 'test/dummy/script/**/*'
- 'vendor/bundle/**/*'

Metrics/AbcSize:
Expand Down Expand Up @@ -46,14 +45,7 @@ Rails/HttpPositionalArguments:
Style/Documentation:
Enabled: false

Style/FileName:
Exclude:
- Appraisals

# TODO: Remove when targeting Ruby 2.3 because it is already enabled.
Style/FrozenStringLiteralComment:
Enabled: true
EnforcedStyle: always

Style/SpaceAroundOperators:
AllowForAlignment: true
3 changes: 0 additions & 3 deletions .travis.yml
@@ -1,8 +1,5 @@
language: ruby
sudo: false
before_install:
- gem update --system 2.6.11
- gem install bundler -v '~> 1.14'
rvm:
- 2.2.7
- 2.3.4
Expand Down
2 changes: 1 addition & 1 deletion Appraisals
Expand Up @@ -5,5 +5,5 @@ appraise 'rails-5.0' do
end

appraise 'rails-5.1' do
gem 'rails', '~> 5.1.0.rc2'
gem 'rails', '~> 5.1.0'
end
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog

## 5.4.1 / 2017-06-01

* [ENHANCEMENT] Update development dependencies

## 5.4.0 / 2017-04-26

* [ENHANCEMENT] Rails 5.1 compatibility
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -2,7 +2,7 @@

[![Gem Version](https://badge.fury.io/rb/route_translator.svg)](http://badge.fury.io/rb/route_translator)
[![Build Status](https://travis-ci.org/enriclluelles/route_translator.svg?branch=master)](https://travis-ci.org/enriclluelles/route_translator)
[![Dependency Status](https://gemnasium.com/enriclluelles/route_translator.svg)](https://gemnasium.com/enriclluelles/route_translator)
[![Dependency Status](https://gemnasium.com/badges/github.com/enriclluelles/route_translator.svg)](https://gemnasium.com/github.com/enriclluelles/route_translator)
[![Code Climate](https://codeclimate.com/github/enriclluelles/route_translator/badges/gpa.svg)](https://codeclimate.com/github/enriclluelles/route_translator)
[![Coverage Status](https://coveralls.io/repos/github/enriclluelles/route_translator/badge.svg?branch=master)](https://coveralls.io/github/enriclluelles/route_translator?branch=master)

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5.1.gemfile
Expand Up @@ -2,6 +2,6 @@

source "https://rubygems.org"

gem "rails", "~> 5.1.0.rc2"
gem "rails", "~> 5.1.0"

gemspec path: "../"
2 changes: 1 addition & 1 deletion lib/route_translator/version.rb
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module RouteTranslator
VERSION = '5.4.0'.freeze
VERSION = '5.4.1'.freeze
end
4 changes: 2 additions & 2 deletions route_translator.gemspec
Expand Up @@ -23,10 +23,10 @@ Gem::Specification.new do |spec|

spec.add_development_dependency 'appraisal', '~> 2.1'
spec.add_development_dependency 'byebug', '~> 9.0'
spec.add_development_dependency 'coveralls', '~> 0.8.20'
spec.add_development_dependency 'coveralls', '~> 0.8.21'
spec.add_development_dependency 'minitest', '~> 5.10'
spec.add_development_dependency 'rails', '>= 5.0.0.1', '< 5.2'
spec.add_development_dependency 'rake', '~> 12.0'
spec.add_development_dependency 'rubocop', '~> 0.48.1'
spec.add_development_dependency 'rubocop', '~> 0.49.1'
spec.add_development_dependency 'simplecov', '~> 0.14.1'
end

0 comments on commit 1ffa9a4

Please sign in to comment.