summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-05-21 18:41:31 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-06-14 23:06:17 -0400
commitcc14a90de9a46e95a0196c14ba352ac95f578856 (patch)
tree041b60449cbaf77d18f1304af91e1533778e1fe2
parent06ce722aa9193d74db6eb71d45f9d8ed6df0d3c0 (diff)
downloadgitlab-ce-cc14a90de9a46e95a0196c14ba352ac95f578856.tar.gz
Update email_spec gem
This fixes spec/mailers/notify_spec
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 19a5a76ed91..138cc0c9dd7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -256,7 +256,7 @@ end
group :test do
gem 'simplecov', require: false
gem 'shoulda-matchers', '~> 2.8.0', require: false
- gem 'email_spec'
+ gem 'email_spec', '~> 1.6.0'
gem 'webmock', '~> 1.21.0'
gem 'test_after_commit'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 93a2c7fa80c..84e8043220f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -154,7 +154,7 @@ GEM
dotenv (0.9.0)
dropzonejs-rails (0.4.14)
rails (> 3.1)
- email_spec (1.5.0)
+ email_spec (1.6.0)
launchy (~> 2.1)
mail (~> 2.2)
encryptor (1.3.0)
@@ -348,7 +348,7 @@ GEM
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.9.2)
- launchy (2.4.2)
+ launchy (2.4.3)
addressable (~> 2.3)
letter_opener (1.1.2)
launchy (~> 2.2)
@@ -755,7 +755,7 @@ DEPENDENCIES
diffy (~> 3.0.3)
doorkeeper (= 2.1.3)
dropzonejs-rails
- email_spec
+ email_spec (~> 1.6.0)
enumerize
factory_girl_rails
ffaker (~> 2.0.0)