Commit 4c5312134acc27500568b3592f49cb27ae7469f0
1 parent
a37a95ff
Exists in
master
and in
1 other branch
Added Ruby 2.1.0 to travis and fixed rbx-d19
As by this issue: https://github.com/travis-ci/travis-ci/issues/1641 rbx-d19 is not recommended (and does not work anymore)
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
.travis.yml
| @@ -5,13 +5,13 @@ rvm: | @@ -5,13 +5,13 @@ rvm: | ||
| 5 | - 2.0.0 | 5 | - 2.0.0 |
| 6 | - 1.9.3 | 6 | - 1.9.3 |
| 7 | - 2.1.2 | 7 | - 2.1.2 |
| 8 | - - rbx-19mode | 8 | + - rbx-2 |
| 9 | - ruby-head | 9 | - ruby-head |
| 10 | services: mongodb | 10 | services: mongodb |
| 11 | #script: ./script/rspec-queue-mongoid.rb --format progress spec | 11 | #script: ./script/rspec-queue-mongoid.rb --format progress spec |
| 12 | matrix: | 12 | matrix: |
| 13 | allow_failures: | 13 | allow_failures: |
| 14 | - - rvm: rbx-19mode | 14 | + - rvm: rbx-2 |
| 15 | - rvm: ruby-head | 15 | - rvm: ruby-head |
| 16 | 16 | ||
| 17 | 17 |
app/mailers/mailer.rb
| @@ -52,7 +52,7 @@ class Mailer < ActionMailer::Base | @@ -52,7 +52,7 @@ class Mailer < ActionMailer::Base | ||
| 52 | 52 | ||
| 53 | errbit_headers 'App' => @app.name, | 53 | errbit_headers 'App' => @app.name, |
| 54 | 'Environment' => @notice.environment_name, | 54 | 'Environment' => @notice.environment_name, |
| 55 | - 'Problem-Id' => @problem.problem_id, | 55 | + 'Problem-Id' => @problem.id, |
| 56 | 'Comment-Author' => @user.name | 56 | 'Comment-Author' => @user.name |
| 57 | 57 | ||
| 58 | mail :to => recipients, | 58 | mail :to => recipients, |