File tree Expand file tree Collapse file tree 4 files changed +19
-5
lines changed Expand file tree Collapse file tree 4 files changed +19
-5
lines changed Original file line number Diff line number Diff line change @@ -75,6 +75,8 @@ matrix:
75
75
env : RAILS_VERSION='~> 5.2.0'
76
76
- rvm : 2.3.8
77
77
env : RAILS_VERSION='~> 5.2.0'
78
+ - rvm : 2.2.10
79
+ env : RAILS_VERSION='~> 5.2.0'
78
80
79
81
# Rails 5.1 Builds >= 2.2.2
80
82
- rvm : 2.6.6
@@ -85,6 +87,8 @@ matrix:
85
87
env : RAILS_VERSION='~> 5.1.0'
86
88
- rvm : 2.3.8
87
89
env : RAILS_VERSION='~> 5.1.0'
90
+ - rvm : 2.2.10
91
+ env : RAILS_VERSION='~> 5.1.0'
88
92
89
93
# Rails 5.0 Builds >= 2.2.2
90
94
- rvm : 2.6.6
@@ -95,5 +99,7 @@ matrix:
95
99
env : RAILS_VERSION='~> 5.0.0'
96
100
- rvm : 2.3.8
97
101
env : RAILS_VERSION='~> 5.0.0'
102
+ - rvm : 2.2.10
103
+ env : RAILS_VERSION='~> 5.0.0'
98
104
99
105
fast_finish : true
Original file line number Diff line number Diff line change 56
56
57
57
gem "rubyzip" , '~> 1.2'
58
58
59
- gem 'rubocop' , '~> 0.80.1'
59
+ if RUBY_VERSION . to_f >= 2.3
60
+ gem 'rubocop' , '~> 0.80.1'
61
+ end
60
62
61
63
custom_gemfile = File . expand_path ( 'Gemfile-custom' , __dir__ )
62
64
eval_gemfile custom_gemfile if File . exist? ( custom_gemfile )
Original file line number Diff line number Diff line change @@ -21,8 +21,8 @@ module MailerExampleGroup
21
21
22
22
included do
23
23
include ::Rails . application . routes . url_helpers
24
- options = ::Rails . configuration . action_mailer . default_url_options
25
- options & .each { |key , value | default_url_options [ key ] = value }
24
+ options = ::Rails . configuration . action_mailer . default_url_options || { }
25
+ options . each { |key , value | default_url_options [ key ] = value }
26
26
end
27
27
28
28
# Class-level DSL for mailer specs.
Original file line number Diff line number Diff line change 5
5
set -e
6
6
source script/functions.sh
7
7
8
- gem update --no-document --system
9
- gem install --no-document bundler
8
+ if is_ruby_23_plus; then
9
+ gem update --no-document --system
10
+ gem install --no-document bundler
11
+ else
12
+ echo " Warning installing older versions of Rubygems / Bundler"
13
+ gem update --system ' 2.7.8'
14
+ gem install bundler -v ' 1.17.3'
15
+ fi
You can’t perform that action at this time.
0 commit comments