diff options
| -rw-r--r-- | app/views/teams/show.html.haml | 4 | ||||
| -rw-r--r-- | db/schema.rb | 21 | ||||
| -rw-r--r-- | features/steps/group/group.rb | 4 |
3 files changed, 14 insertions, 15 deletions
diff --git a/app/views/teams/show.html.haml b/app/views/teams/show.html.haml index eef13cbe76c..34be7692416 100644 --- a/app/views/teams/show.html.haml +++ b/app/views/teams/show.html.haml @@ -1,6 +1,6 @@ -- if @group.description.present? +- if @team.description.present? .description - = @group.description + = @team.description %hr .projects diff --git a/db/schema.rb b/db/schema.rb index 63f498e4a66..e0ad8294e75 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -143,18 +143,16 @@ ActiveRecord::Schema.define(:version => 20130220133245) do t.string "name" t.string "path" t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "creator_id" t.string "default_branch" - t.boolean "issues_enabled", :default => true, :null => false - t.boolean "wall_enabled", :default => true, :null => false - t.boolean "merge_requests_enabled", :default => true, :null => false - t.boolean "wiki_enabled", :default => true, :null => false + t.boolean "issues_enabled", :default => true, :null => false + t.boolean "wall_enabled", :default => true, :null => false + t.boolean "merge_requests_enabled", :default => true, :null => false + t.boolean "wiki_enabled", :default => true, :null => false t.integer "namespace_id" - t.boolean "public", :default => false, :null => false - t.string "issues_tracker", :default => "gitlab", :null => false - t.string "issues_tracker_id" + t.boolean "public", :default => false, :null => false end add_index "projects", ["creator_id"], :name => "index_projects_on_owner_id" @@ -233,8 +231,9 @@ ActiveRecord::Schema.define(:version => 20130220133245) do t.string "name" t.string "path" t.integer "owner_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + t.string "description", :default => "", :null => false end create_table "users", :force => true do |t| diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb index 3438ad8ddab..75db9fef146 100644 --- a/features/steps/group/group.rb +++ b/features/steps/group/group.rb @@ -69,8 +69,8 @@ class Groups < Spinach::FeatureSteps end And 'submit form with new group info' do - fill_in 'group_name', :with => 'Samurai' - fill_in 'group_description', :with => 'Tokugawa Shogunate' + fill_in 'group_name', with: 'Samurai' + fill_in 'group_description', with: 'Tokugawa Shogunate' click_button "Create group" end |