summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock3
-rw-r--r--config/environments/development.rb1
3 files changed, 5 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index fc040ce08c8..8da55b10956 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,7 @@ group :assets do
end
group :development do
+ gem 'letter_opener'
gem 'rails-footnotes', '>= 3.7.5.rc4'
gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 83df35b52af..f66e832e4a6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -119,6 +119,8 @@ GEM
rails (>= 3.0.0)
launchy (2.0.5)
addressable (~> 2.2.6)
+ letter_opener (0.0.2)
+ launchy
libv8 (3.3.10.2)
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
@@ -262,6 +264,7 @@ DEPENDENCIES
jquery-rails
kaminari
launchy
+ letter_opener
pygments.rb (= 0.2.3)
rails (= 3.1.0)
rails-footnotes (>= 3.7.5.rc4)
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 9e5bf8215e7..173bfc74c7c 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -29,4 +29,5 @@ Gitlab::Application.configure do
config.assets.debug = true
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+ config.action_mailer.delivery_method = :letter_opener
end