Download as
Browse Code »

Commit 267bd6068c7a57316ef357f9385e12fea6c8d69f

Authored by Nihad Abbasov
2 parents 3e95a6d7 11b70c97
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'issue-101' into dev

Showing 4 changed files with 6 additions and 1 deletions   Show diff stats
Gemfile
  Diff comments   View file @267bd60
... ... @@ -28,6 +28,7 @@ group :assets do
28 28 end
29 29  
30 30 group :development do
  31 + gem 'letter_opener'
31 32 gem 'rails-footnotes', '>= 3.7.5.rc4'
32 33 gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git'
33 34 end
... ...
Gemfile.lock
  Diff comments   View file @267bd60
... ... @@ -119,6 +119,8 @@ GEM
119 119 rails (>= 3.0.0)
120 120 launchy (2.0.5)
121 121 addressable (~> 2.2.6)
  122 + letter_opener (0.0.2)
  123 + launchy
122 124 libv8 (3.3.10.2)
123 125 linecache19 (0.5.12)
124 126 ruby_core_source (>= 0.1.4)
... ... @@ -262,6 +264,7 @@ DEPENDENCIES
262 264 jquery-rails
263 265 kaminari
264 266 launchy
  267 + letter_opener
265 268 pygments.rb (= 0.2.3)
266 269 rails (= 3.1.0)
267 270 rails-footnotes (>= 3.7.5.rc4)
... ...
app/controllers/issues_controller.rb
  Diff comments   View file @267bd60
... ... @@ -41,7 +41,7 @@ class IssuesController < ApplicationController
41 41 def create
42 42 @issue = @project.issues.new(params[:issue])
43 43 @issue.author = current_user
44   - if @issue.save
  44 + if @issue.save && @issue.assignee != current_user
45 45 Notify.new_issue_email(@issue).deliver
46 46 end
47 47  
... ...
config/environments/development.rb
  Diff comments   View file @267bd60
... ... @@ -29,4 +29,5 @@ Gitlab::Application.configure do
29 29 config.assets.debug = true
30 30  
31 31 config.action_mailer.default_url_options = { :host => 'localhost:3000' }
  32 + config.action_mailer.delivery_method = :letter_opener
32 33 end
... ...