Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/models/issue.rb5
-rw-r--r--app/views/issues/_form.html.haml8
-rw-r--r--app/views/issues/show.html.haml6
-rw-r--r--db/schema.rb1
4 files changed, 15 insertions, 5 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 632e6537aad..dfc0622f975 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -24,6 +24,10 @@ class Issue < ActiveRecord::Base
validates :title,
:presence => true,
:length => { :within => 0..255 }
+
+ validates :description,
+ :presence => true,
+ :length => { :within => 0..2000 }
scope :critical, where(:critical => true)
scope :non_critical, where(:critical => false)
@@ -57,6 +61,7 @@ end
#
# id :integer not null, primary key
# title :string(255)
+# description :text
# assignee_id :integer
# author_id :integer
# project_id :integer
diff --git a/app/views/issues/_form.html.haml b/app/views/issues/_form.html.haml
index 41ab329f785..a91153e3001 100644
--- a/app/views/issues/_form.html.haml
+++ b/app/views/issues/_form.html.haml
@@ -9,8 +9,12 @@
%li= msg
.clearfix
- = f.label :title, "Issue Message"
- .input= f.text_area :title, :maxlength => 255, :class => "xxlarge"
+ = f.label :title, "Issue Subject"
+ .input= f.text_field :title, :maxlength => 255
+
+ .clearfix
+ = f.label :description, "Issue Description"
+ .input= f.text_area :description, :maxlength => 2000, :class => "xxlarge"
.clearfix
= f.label :assignee_id
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index ab0e82c6b98..edd13d6ebc7 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -1,5 +1,5 @@
-%h3
- Issue ##{@issue.id}
+%h3
+ @issue.title
%small
created at
= @issue.created_at.stamp("Aug 21, 2011")
@@ -43,7 +43,7 @@
%hr
- %div= simple_format @issue.title
+ %div= simple_format @issue.description
.issue_notes#notes= render "notes/notes", :tid => @issue.id, :tt => "issue"
diff --git a/db/schema.rb b/db/schema.rb
index 45e18a68cf3..991401b5793 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -27,6 +27,7 @@ ActiveRecord::Schema.define(:version => 20120307095918) do
create_table "issues", :force => true do |t|
t.string "title"
+ t.text "description"
t.integer "assignee_id"
t.integer "author_id"
t.integer "project_id"