Skip to content

Commit

Permalink
Update ruby to version 2.5.1 (#3293)
Browse files Browse the repository at this point in the history
* Update Gemfile.lock to update erb_lint to v 0.0.24

* fix erb_lint errors

* update to ruby 2.5.1

* Use ruby 2.5.1's docker image

* Update decidim-generators Gemfile.lock

* Update decidim_app-design Gemfile.lock

* Update decidim_app-design Gemfile.lock (2)
  • Loading branch information
agustibr authored and josepjaume committed May 2, 2018
1 parent 6dad250 commit a65219f
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -4,7 +4,7 @@ defaults: &defaults
docker:
# This is the sha of the latest `decidim/decidim:latest-test` docker image. You can retrieve the
# latest digest by doing `$ docker pull decidim/decidim:latest-test`.
- image: decidim/decidim@sha256:2643b48944b2a2aedfb84ef6e48c1beec285c167319923422522bfa6df53d287
- image: decidim/decidim@sha256:889d2f57b238518d0d9bd1177db860f2cc58caae4d1094b86e4e154e41b6aaa4
environment:
BUNDLE_GEMFILE: /app/Gemfile
SIMPLECOV: true
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
2.5.0
2.5.1
2 changes: 1 addition & 1 deletion Gemfile.lock
Expand Up @@ -689,7 +689,7 @@ DEPENDENCIES
web-console (~> 3.5)

RUBY VERSION
ruby 2.5.0p0
ruby 2.5.1p57

BUNDLED WITH
1.16.1
2 changes: 1 addition & 1 deletion decidim-generators/Gemfile.lock
Expand Up @@ -665,7 +665,7 @@ DEPENDENCIES
web-console (~> 3.5)

RUBY VERSION
ruby 2.5.0p0
ruby 2.5.1p57

BUNDLED WITH
1.16.1
80 changes: 40 additions & 40 deletions decidim_app-design/Gemfile.lock
Expand Up @@ -184,44 +184,44 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.5)
actionpack (= 5.1.5)
actioncable (5.1.6)
actionpack (= 5.1.6)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.5)
actionpack (= 5.1.5)
actionview (= 5.1.5)
activejob (= 5.1.5)
actionmailer (5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.5)
actionview (= 5.1.5)
activesupport (= 5.1.5)
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.5)
activesupport (= 5.1.5)
actionview (5.1.6)
activesupport (= 5.1.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
active_link_to (1.0.5)
actionpack
addressable
activejob (5.1.5)
activesupport (= 5.1.5)
activejob (5.1.6)
activesupport (= 5.1.6)
globalid (>= 0.3.6)
activemodel (5.1.5)
activesupport (= 5.1.5)
activerecord (5.1.5)
activemodel (= 5.1.5)
activesupport (= 5.1.5)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activesupport (5.1.5)
activesupport (5.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
Expand Down Expand Up @@ -249,7 +249,7 @@ GEM
smart_properties
bindex (0.5.0)
builder (3.2.3)
byebug (10.0.0)
byebug (10.0.2)
cancancan (2.2.0)
capybara (2.18.0)
addressable
Expand Down Expand Up @@ -371,7 +371,7 @@ GEM
htmlentities (4.3.4)
httparty (0.16.2)
multi_xml (>= 0.5.2)
i18n (0.9.5)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
i18n-tasks (0.9.21)
activesupport (>= 4.0.2)
Expand Down Expand Up @@ -482,22 +482,22 @@ GEM
actionmailer (>= 3, < 6)
premailer (~> 1.7, >= 1.7.9)
public_suffix (3.0.2)
puma (3.11.3)
rack (2.0.4)
puma (3.11.4)
rack (2.0.5)
rack-cors (1.0.2)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.1.5)
actioncable (= 5.1.5)
actionmailer (= 5.1.5)
actionpack (= 5.1.5)
actionview (= 5.1.5)
activejob (= 5.1.5)
activemodel (= 5.1.5)
activerecord (= 5.1.5)
activesupport (= 5.1.5)
rails (5.1.6)
actioncable (= 5.1.6)
actionmailer (= 5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
activemodel (= 5.1.6)
activerecord (= 5.1.6)
activesupport (= 5.1.6)
bundler (>= 1.3.0)
railties (= 5.1.5)
railties (= 5.1.6)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
Expand All @@ -511,9 +511,9 @@ GEM
rails-i18n (5.1.1)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
railties (5.1.5)
actionpack (= 5.1.5)
activesupport (= 5.1.5)
railties (5.1.6)
actionpack (= 5.1.6)
activesupport (= 5.1.6)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
Expand Down Expand Up @@ -638,7 +638,7 @@ GEM
tzinfo (1.2.5)
thread_safe (~> 0.1)
uber (0.1.0)
uglifier (4.1.7)
uglifier (4.1.10)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.3.2)
valid_email2 (2.2.3)
Expand All @@ -651,7 +651,7 @@ GEM
equalizer (~> 0.0, >= 0.0.9)
warden (1.2.7)
rack (>= 1.0)
web-console (3.6.0)
web-console (3.6.1)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
Expand Down Expand Up @@ -689,7 +689,7 @@ DEPENDENCIES
web-console (~> 3.5)

RUBY VERSION
ruby 2.5.0p0
ruby 2.5.1p57

BUNDLED WITH
1.16.1

0 comments on commit a65219f

Please sign in to comment.