Skip to content

Commit 4a75ca3

Browse files
committed
Upgrade coffee-rails to fix random spec failures on travis
jashkenas/coffeescript#3829
1 parent 43463b5 commit 4a75ca3

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ gem 'protected_attributes', '~>1.0.8' # This must be loaded before some other ge
7979
gem 'ace-rails-ap', '~> 2.0.1'
8080
gem 'bootstrap-kaminari-views', '~> 0.0.3'
8181
gem 'bundler', '>= 1.5.0'
82-
gem 'coffee-rails', '~> 4.1.0'
82+
gem 'coffee-rails', '~> 4.1.1'
8383
gem 'daemons', '~> 1.1.9'
8484
gem 'delayed_job', '~> 4.1.0'
8585
gem 'delayed_job_active_record', github: 'collectiveidea/delayed_job_active_record', branch: 'master'

Gemfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,13 @@ GEM
144144
chronic (0.10.2)
145145
cliver (0.3.2)
146146
coderay (1.1.0)
147-
coffee-rails (4.1.0)
147+
coffee-rails (4.1.1)
148148
coffee-script (>= 2.2.0)
149-
railties (>= 4.0.0, < 5.0)
150-
coffee-script (2.3.0)
149+
railties (>= 4.0.0, < 5.1.x)
150+
coffee-script (2.4.1)
151151
coffee-script-source
152152
execjs
153-
coffee-script-source (1.9.1)
153+
coffee-script-source (1.10.0)
154154
colorize (0.7.7)
155155
concurrent-ruby (1.0.1)
156156
cookiejar (0.3.2)
@@ -585,7 +585,7 @@ DEPENDENCIES
585585
capistrano-bundler (~> 1.1.4)
586586
capistrano-rails (~> 1.1)
587587
capybara-select2
588-
coffee-rails (~> 4.1.0)
588+
coffee-rails (~> 4.1.1)
589589
coveralls
590590
daemons (~> 1.1.9)
591591
delayed_job (~> 4.1.0)

0 commit comments

Comments
 (0)