Commit 267bd606 authored by Nihad Abbasov's avatar Nihad Abbasov

Merge branch 'issue-101' into dev

parents 3e95a6d7 11b70c97
...@@ -28,6 +28,7 @@ group :assets do ...@@ -28,6 +28,7 @@ group :assets do
end end
group :development do group :development do
gem 'letter_opener'
gem 'rails-footnotes', '>= 3.7.5.rc4' gem 'rails-footnotes', '>= 3.7.5.rc4'
gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git' gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git'
end end
......
...@@ -119,6 +119,8 @@ GEM ...@@ -119,6 +119,8 @@ GEM
rails (>= 3.0.0) rails (>= 3.0.0)
launchy (2.0.5) launchy (2.0.5)
addressable (~> 2.2.6) addressable (~> 2.2.6)
letter_opener (0.0.2)
launchy
libv8 (3.3.10.2) libv8 (3.3.10.2)
linecache19 (0.5.12) linecache19 (0.5.12)
ruby_core_source (>= 0.1.4) ruby_core_source (>= 0.1.4)
...@@ -262,6 +264,7 @@ DEPENDENCIES ...@@ -262,6 +264,7 @@ DEPENDENCIES
jquery-rails jquery-rails
kaminari kaminari
launchy launchy
letter_opener
pygments.rb (= 0.2.3) pygments.rb (= 0.2.3)
rails (= 3.1.0) rails (= 3.1.0)
rails-footnotes (>= 3.7.5.rc4) rails-footnotes (>= 3.7.5.rc4)
......
...@@ -41,7 +41,7 @@ class IssuesController < ApplicationController ...@@ -41,7 +41,7 @@ class IssuesController < ApplicationController
def create def create
@issue = @project.issues.new(params[:issue]) @issue = @project.issues.new(params[:issue])
@issue.author = current_user @issue.author = current_user
if @issue.save if @issue.save && @issue.assignee != current_user
Notify.new_issue_email(@issue).deliver Notify.new_issue_email(@issue).deliver
end end
......
...@@ -29,4 +29,5 @@ Gitlab::Application.configure do ...@@ -29,4 +29,5 @@ Gitlab::Application.configure do
config.assets.debug = true config.assets.debug = true
config.action_mailer.default_url_options = { :host => 'localhost:3000' } config.action_mailer.default_url_options = { :host => 'localhost:3000' }
config.action_mailer.delivery_method = :letter_opener
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment