Skip to content
Snippets Groups Projects
Commit a0171813 authored by gitlabhq's avatar gitlabhq
Browse files

new issue format

parent 56d97618
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -662,6 +662,10 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
background: #4466cc;
color:white;
}
&.normal {
background: #2c5ca6;
color:white;
}
&.notes {
background: #2c5c66;
color:white;
Loading
Loading
Loading
Loading
@@ -34,7 +34,7 @@ class IssuesController < ApplicationController
end
 
def show
@notes = @issue.notes
@notes = @issue.notes.order("created_at ASC")
@note = @project.notes.new(:noteable => @issue)
end
 
Loading
Loading
Loading
Loading
@@ -7,7 +7,7 @@
= truncate issue.assignee.name, :lenght => 20
%td ##{issue.id}
%td
= truncate(html_escape(issue.title), :length => 50)
= truncate(html_escape(issue.title), :length => 60)
%br
- if issue.critical
%span.tag.high critical
Loading
Loading
%h2
= "Issue ##{@issue.id} - #{truncate @issue.title, :length => 50}"
= "Issue ##{@issue.id} - #{html_escape(@issue.title)}"
.span-15
-#= simple_format html_escape(@issue.content)
.issue_notes= render "notes/notes"
Loading
Loading
@@ -29,6 +28,16 @@
%td
= image_tag gravatar_icon(@issue.assignee.email), :class => "left", :width => 40, :style => "padding:0 5px;"
= @issue.assignee.name
%tr
%td Tags
%td
- if @issue.critical
%span.tag.high critical
- else
%span.tag.normal normal
- if @issue.today?
%span.tag.today today
%tr
%td Closed?
%td
Loading
Loading
class IssueContenToNote < ActiveRecord::Migration
def up
raise "Not ready"
puts "Issue content is deprecated -> move to notes"
Issue.find_each(:batch_size => 100) do |issue|
next if issue.content.blank?
note = Note.new(
:note => issue.content,
:project_id => issue.project_id,
:noteable => issue,
:created_at => issue.created_at,
:updated_at => issue.created_at
)
note.author_id = issue.author_id
if note.save
issue.update_attributes(:content => nil)
print "."
else
print "F"
end
end
total = Issue.where("content is not null").count
if total > 0
puts "content of #{total} issues were not migrated"
else
puts "Done"
end
end
 
Loading
Loading
Loading
Loading
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
 
ActiveRecord::Schema.define(:version => 20111027142641) do
ActiveRecord::Schema.define(:version => 20111027152724) do
 
create_table "issues", :force => true do |t|
t.string "title"
Loading
Loading
Loading
Loading
@@ -32,7 +32,6 @@ end
 
Factory.add(:issue, Issue) do |obj|
obj.title = Faker::Lorem.sentence
obj.content = Faker::Lorem.sentences
end
 
Factory.add(:snippet, Snippet) do |obj|
Loading
Loading
Loading
Loading
@@ -80,7 +80,6 @@ describe "Issues" do
describe "fill in" do
before do
fill_in "issue_title", :with => "bug 345"
fill_in "issue_content", :with => "app bug 345"
click_link "Select user"
click_link @user.name
end
Loading
Loading
@@ -112,6 +111,23 @@ describe "Issues" do
end
end
 
describe "Show issue" do
before do
@issue = Factory :issue,
:author => @user,
:assignee => @user,
:project => project
visit project_issue_path(project, @issue)
end
it "should have valid show page for issue" do
page.should have_content @issue.title
page.should have_content @user.name
page.should have_content "today"
end
end
describe "Edit issue", :js => true do
before do
@issue = Factory :issue,
Loading
Loading
@@ -129,7 +145,6 @@ describe "Issues" do
describe "fill in" do
before do
fill_in "issue_title", :with => "bug 345"
fill_in "issue_content", :with => "app bug 345"
end
 
it { expect { click_button "Save" }.to_not change {Issue.count} }
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment