Download as
Browse Code »

Commit 2f1f05d431d1df062e46365930b98b358554a07d

Authored by Andrew8xx8
1 parent d3f042a6
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fixed notes from randx

Showing 3 changed files with 14 additions and 15 deletions   Show diff stats
app/views/teams/show.html.haml
  Diff comments   View file @2f1f05d
1   -- if @group.description.present?
  1 +- if @team.description.present?
2 2 .description
3   - = @group.description
  3 + = @team.description
4 4 %hr
5 5  
6 6 .projects
... ...
db/schema.rb
  Diff comments   View file @2f1f05d
... ... @@ -143,18 +143,16 @@ ActiveRecord::Schema.define(:version => 20130220133245) do
143 143 t.string "name"
144 144 t.string "path"
145 145 t.text "description"
146   - t.datetime "created_at", :null => false
147   - t.datetime "updated_at", :null => false
  146 + t.datetime "created_at", :null => false
  147 + t.datetime "updated_at", :null => false
148 148 t.integer "creator_id"
149 149 t.string "default_branch"
150   - t.boolean "issues_enabled", :default => true, :null => false
151   - t.boolean "wall_enabled", :default => true, :null => false
152   - t.boolean "merge_requests_enabled", :default => true, :null => false
153   - t.boolean "wiki_enabled", :default => true, :null => false
  150 + t.boolean "issues_enabled", :default => true, :null => false
  151 + t.boolean "wall_enabled", :default => true, :null => false
  152 + t.boolean "merge_requests_enabled", :default => true, :null => false
  153 + t.boolean "wiki_enabled", :default => true, :null => false
154 154 t.integer "namespace_id"
155   - t.boolean "public", :default => false, :null => false
156   - t.string "issues_tracker", :default => "gitlab", :null => false
157   - t.string "issues_tracker_id"
  155 + t.boolean "public", :default => false, :null => false
158 156 end
159 157  
160 158 add_index "projects", ["creator_id"], :name => "index_projects_on_owner_id"
... ... @@ -233,8 +231,9 @@ ActiveRecord::Schema.define(:version => 20130220133245) do
233 231 t.string "name"
234 232 t.string "path"
235 233 t.integer "owner_id"
236   - t.datetime "created_at", :null => false
237   - t.datetime "updated_at", :null => false
  234 + t.datetime "created_at", :null => false
  235 + t.datetime "updated_at", :null => false
  236 + t.string "description", :default => "", :null => false
238 237 end
239 238  
240 239 create_table "users", :force => true do |t|
... ...
features/steps/group/group.rb
  Diff comments   View file @2f1f05d
... ... @@ -69,8 +69,8 @@ class Groups < Spinach::FeatureSteps
69 69 end
70 70  
71 71 And 'submit form with new group info' do
72   - fill_in 'group_name', :with => 'Samurai'
73   - fill_in 'group_description', :with => 'Tokugawa Shogunate'
  72 + fill_in 'group_name', with: 'Samurai'
  73 + fill_in 'group_description', with: 'Tokugawa Shogunate'
74 74 click_button "Create group"
75 75 end
76 76  
... ...