kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'update-mail-room' into 'master'

Browse source 
Update mail_room

See merge request !1213
This commit is contained in:
Robert Speicher 2015-08-26 16:23:51 +00:00
commit de3b7d9c52
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -273,6 +273,6 @@ gem "newrelic_rpm"
gem 'octokit', '3.7.0'
gem "mail_room", "~> 0.4.0"
gem "mail_room", "~> 0.4.1"
gem 'email_reply_parser'

4
Gemfile.lock
View file

@ -372,7 +372,7 @@ GEM
systemu (~> 2.6.2)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mail_room (0.4.0)
mail_room (0.4.1)
method_source (0.8.2)
mime-types (1.25.1)
mimemagic (0.3.0)
@ -808,7 +808,7 @@ DEPENDENCIES
jquery-ui-rails
kaminari (~> 0.15.1)
letter_opener
mail_room (~> 0.4.0)
mail_room (~> 0.4.1)
minitest (~> 5.3.0)
mousetrap-rails
mysql2