Commit babd0557cb5ca874769b5b83fd9298a6efabb2ef
Exists in
master
and in
4 other branches
Merge branch 'dev' into new_layout
Conflicts: app/assets/stylesheets/projects.css.scss
Showing
6 changed files
with
16 additions
and
7 deletions
Show diff stats
Gemfile
| @@ -28,6 +28,7 @@ group :assets do | @@ -28,6 +28,7 @@ group :assets do | ||
| 28 | end | 28 | end |
| 29 | 29 | ||
| 30 | group :development do | 30 | group :development do |
| 31 | + gem 'letter_opener' | ||
| 31 | gem 'rails-footnotes', '>= 3.7.5.rc4' | 32 | gem 'rails-footnotes', '>= 3.7.5.rc4' |
| 32 | gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git' | 33 | gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git' |
| 33 | end | 34 | end |
Gemfile.lock
| @@ -119,6 +119,8 @@ GEM | @@ -119,6 +119,8 @@ GEM | ||
| 119 | rails (>= 3.0.0) | 119 | rails (>= 3.0.0) |
| 120 | launchy (2.0.5) | 120 | launchy (2.0.5) |
| 121 | addressable (~> 2.2.6) | 121 | addressable (~> 2.2.6) |
| 122 | + letter_opener (0.0.2) | ||
| 123 | + launchy | ||
| 122 | libv8 (3.3.10.2) | 124 | libv8 (3.3.10.2) |
| 123 | linecache19 (0.5.12) | 125 | linecache19 (0.5.12) |
| 124 | ruby_core_source (>= 0.1.4) | 126 | ruby_core_source (>= 0.1.4) |
| @@ -262,6 +264,7 @@ DEPENDENCIES | @@ -262,6 +264,7 @@ DEPENDENCIES | ||
| 262 | jquery-rails | 264 | jquery-rails |
| 263 | kaminari | 265 | kaminari |
| 264 | launchy | 266 | launchy |
| 267 | + letter_opener | ||
| 265 | pygments.rb (= 0.2.3) | 268 | pygments.rb (= 0.2.3) |
| 266 | rails (= 3.1.0) | 269 | rails (= 3.1.0) |
| 267 | rails-footnotes (>= 3.7.5.rc4) | 270 | rails-footnotes (>= 3.7.5.rc4) |
app/assets/stylesheets/projects.css.scss
| @@ -364,7 +364,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td { | @@ -364,7 +364,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td { | ||
| 364 | text-shadow: #555 1px 1px; | 364 | text-shadow: #555 1px 1px; |
| 365 | } | 365 | } |
| 366 | 366 | ||
| 367 | -/** FALSH **/ | 367 | +/** FLASH **/ |
| 368 | 368 | ||
| 369 | #flash_container { | 369 | #flash_container { |
| 370 | height:40px; | 370 | height:40px; |
| @@ -636,9 +636,9 @@ tbody tr:nth-child(2n) td, tbody tr.even td { | @@ -636,9 +636,9 @@ tbody tr:nth-child(2n) td, tbody tr.even td { | ||
| 636 | } | 636 | } |
| 637 | 637 | ||
| 638 | .top_panel_issues{ | 638 | .top_panel_issues{ |
| 639 | - #issue_search_form { | ||
| 640 | - margin:5px 0; | ||
| 641 | - input { | 639 | + #issue_search_form { |
| 640 | + margin:5px 0; | ||
| 641 | + input { | ||
| 642 | border:1px solid #D3D3D3; | 642 | border:1px solid #D3D3D3; |
| 643 | padding: 3px; | 643 | padding: 3px; |
| 644 | height: 28px; | 644 | height: 28px; |
| @@ -647,7 +647,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td { | @@ -647,7 +647,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td { | ||
| 647 | box-sizing: border-box; | 647 | box-sizing: border-box; |
| 648 | -moz-box-sizing: border-box; | 648 | -moz-box-sizing: border-box; |
| 649 | 649 | ||
| 650 | - &:focus { | 650 | + &:focus { |
| 651 | border-color:#c2e1ef; | 651 | border-color:#c2e1ef; |
| 652 | } | 652 | } |
| 653 | } | 653 | } |
| @@ -672,4 +672,6 @@ tbody tr:nth-child(2n) td, tbody tr.even td { | @@ -672,4 +672,6 @@ tbody tr:nth-child(2n) td, tbody tr.even td { | ||
| 672 | } | 672 | } |
| 673 | .width-65p{ | 673 | .width-65p{ |
| 674 | width:65%; | 674 | width:65%; |
| 675 | +pre.commit_message { | ||
| 676 | + white-space: pre-wrap; | ||
| 675 | } | 677 | } |
app/controllers/issues_controller.rb
| @@ -42,7 +42,7 @@ class IssuesController < ApplicationController | @@ -42,7 +42,7 @@ class IssuesController < ApplicationController | ||
| 42 | def create | 42 | def create |
| 43 | @issue = @project.issues.new(params[:issue]) | 43 | @issue = @project.issues.new(params[:issue]) |
| 44 | @issue.author = current_user | 44 | @issue.author = current_user |
| 45 | - if @issue.save | 45 | + if @issue.save && @issue.assignee != current_user |
| 46 | Notify.new_issue_email(@issue).deliver | 46 | Notify.new_issue_email(@issue).deliver |
| 47 | end | 47 | end |
| 48 | 48 |
app/views/commits/show.html.haml
| @@ -16,7 +16,9 @@ | @@ -16,7 +16,9 @@ | ||
| 16 | %td= @commit.committed_date | 16 | %td= @commit.committed_date |
| 17 | %tr | 17 | %tr |
| 18 | %td Message | 18 | %td Message |
| 19 | - %td= @commit.safe_message | 19 | + %td |
| 20 | + %pre.commit_message | ||
| 21 | + = preserve @commit.safe_message | ||
| 20 | %tr | 22 | %tr |
| 21 | %td Tree | 23 | %td Tree |
| 22 | %td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id) | 24 | %td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id) |
config/environments/development.rb
| @@ -29,4 +29,5 @@ Gitlab::Application.configure do | @@ -29,4 +29,5 @@ Gitlab::Application.configure do | ||
| 29 | config.assets.debug = true | 29 | config.assets.debug = true |
| 30 | 30 | ||
| 31 | config.action_mailer.default_url_options = { :host => 'localhost:3000' } | 31 | config.action_mailer.default_url_options = { :host => 'localhost:3000' } |
| 32 | + config.action_mailer.delivery_method = :letter_opener | ||
| 32 | end | 33 | end |