Merge branch 'dev' into new_layout

Conflicts: app/assets/stylesheets/projects.css.scss

Merge branch 'dev' into new_layout
Conflicts: app/assets/stylesheets/projects.css.scss
gitlabhq
2 parents e8d10b32 267bd606
Showing 6 changed files with 16 additions and 7 deletions Show diff stats
Gemfile
Gemfile.lock
app/assets/stylesheets/projects.css.scss
app/controllers/issues_controller.rb
app/views/commits/show.html.haml
config/environments/development.rb
@@ -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
@@ -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)
@@ -364,7 +364,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
   text-shadow: #555 1px 1px;
 }
  
-/** FALSH **/
+/** FLASH **/
  
 #flash_container {
   height:40px;
@@ -636,9 +636,9 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
 }
  
 .top_panel_issues{
-  #issue_search_form { 
-    margin:5px 0; 
-    input { 
+  #issue_search_form {
+    margin:5px 0;
+    input {
       border:1px solid #D3D3D3;
       padding: 3px;
       height: 28px;
@@ -647,7 +647,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
       box-sizing: border-box;
       -moz-box-sizing: border-box;
  
-      &:focus { 
+      &:focus {
         border-color:#c2e1ef;
       }
     }
@@ -672,4 +672,6 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
 }
 .width-65p{
   width:65%;
+pre.commit_message {
+  white-space: pre-wrap;
 }
@@ -42,7 +42,7 @@ class IssuesController &lt; ApplicationController
   def create
     @issue = @project.issues.new(params[:issue])
     @issue.author = current_user
-    if @issue.save
+    if @issue.save && @issue.assignee != current_user
       Notify.new_issue_email(@issue).deliver
     end
  
@@ -16,7 +16,9 @@
     %td= @commit.committed_date
   %tr
     %td Message
-    %td= @commit.safe_message
+    %td
+      %pre.commit_message
+        = preserve @commit.safe_message
   %tr
     %td Tree
     %td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id)
@@ -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
...	...	@@ -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
...	...
...	...	@@ -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)
...	...
...	...	@@ -364,7 +364,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
364	364	text-shadow: #555 1px 1px;
365	365	}
366	366
367		-/ FALSH /
	367	+/ FLASH /
368	368
369	369	#flash_container {
370	370	height:40px;
...	...	@@ -636,9 +636,9 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
636	636	}
637	637
638	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	642	border:1px solid #D3D3D3;
643	643	padding: 3px;
644	644	height: 28px;
...	...	@@ -647,7 +647,7 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
647	647	box-sizing: border-box;
648	648	-moz-box-sizing: border-box;
649	649
650		- &:focus {
	650	+ &:focus {
651	651	border-color:#c2e1ef;
652	652	}
653	653	}
...	...	@@ -672,4 +672,6 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
672	672	}
673	673	.width-65p{
674	674	width:65%;
	675	+pre.commit_message {
	676	+ white-space: pre-wrap;
675	677	}
...	...
...	...	@@ -42,7 +42,7 @@ class IssuesController < ApplicationController
42	42	def create
43	43	@issue = @project.issues.new(params[:issue])
44	44	@issue.author = current_user
45		- if @issue.save
	45	+ if @issue.save && @issue.assignee != current_user
46	46	Notify.new_issue_email(@issue).deliver
47	47	end
48	48
...	...
...	...	@@ -16,7 +16,9 @@
16	16	%td= @commit.committed_date
17	17	%tr
18	18	%td Message
19		- %td= @commit.safe_message
	19	+ %td
	20	+ %pre.commit_message
	21	+ = preserve @commit.safe_message
20	22	%tr
21	23	%td Tree
22	24	%td= link_to 'Browse Code', tree_project_path(@project, :commit_id => @commit.id)
...	...
...	...	@@ -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
...	...