home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +10:00
Code Issues Packages Projects Releases Wiki Activity

Few fixes after pull from gitlab upstream

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2013-08-12 14:20:08 +03:00
parent 9ff730254a
commit cc36f6dcf8
4 changed files with 38 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/common.scss
+4
View File
@@ -361,3 +361,7 @@ img.emoji {
font-size: 14px;
line-height: 24px;
}
.available-groups form {
margin: 5px 0;
}
app/views/groups/edit.html.haml
+4 -4
View File
@@ -72,16 +72,16 @@
.title LDAP group settings
%div.form-holder
= form_for @group do |f|
.clearfix
.control-group
= f.label :ldap_cn do
LDAP Group cn
.input
.controls
= f.text_field :ldap_cn, placeholder: "Ex. QA group", class: "xxlarge left"
.clearfix
.control-group
= f.label :ldap_access do
LDAP Access
.input
.controls
= f.select :ldap_access, options_for_select(UsersGroup.group_access_roles, @group.ldap_access)
.form-actions
app/views/projects/group_links/index.html.haml
+12 -15
View File
@@ -1,19 +1,16 @@
%h3.page_title Share project with groups
%br
%p
Project can be stored in one group at once
%br
However you can share project with other groups here.
%p.light
Project can be stored in one group at once. However you can share project with other groups here.
%hr
.row
.span5.enabled-groups
%h5
%h4
Already shared with:
%ul.bordered-list
- @group_links.each do |group_link|
- group = group_link.group
%li
%h5
%h4
.pull-left
= link_to project_group_link_path(@project, group_link), method: :delete, class: 'btn btn-small append-right-10' do
%i.icon-remove
@@ -23,17 +20,17 @@
%small.light up to Masters
.span5.available-groups
%h5
%h4
Can be shared with:
%ul.bordered-list
- @available_groups.each do |group|
%li
%h5
.pull-right
= form_tag project_group_links_path(@project), method: :post do
= select_tag :group_access, options_for_select(ProjectGroupLink.access_options, ProjectGroupLink::MASTER), class: "span2"
= hidden_field_tag :group_id, group.id
= submit_tag "Share", class: "btn"
.pull-right
= form_tag project_group_links_path(@project), method: :post do
= select_tag :group_access, options_for_select(ProjectGroupLink.access_options, ProjectGroupLink::MASTER), class: "span2"
= hidden_field_tag :group_id, group.id
= submit_tag "Share", class: "btn btn-small"
%h4
%i.icon-folder-close
= group.name
db/schema.rb
+18 -51
View File
@@ -55,8 +55,8 @@ ActiveRecord::Schema.define(:version => 20130809124851) do
t.integer "assignee_id"
t.integer "author_id"
t.integer "project_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "position", :default => 0
t.string "branch_name"
t.text "description"
@@ -73,8 +73,8 @@ ActiveRecord::Schema.define(:version => 20130809124851) do
create_table "keys", :force => true do |t|
t.integer "user_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.text "key"
t.string "title"
t.string "type"
@@ -90,8 +90,8 @@ ActiveRecord::Schema.define(:version => 20130809124851) do
t.integer "author_id"
t.integer "assignee_id"
t.string "title"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.text "st_commits", :limit => 2147483647
t.text "st_diffs", :limit => 2147483647
t.integer "milestone_id"
@@ -143,8 +143,8 @@ ActiveRecord::Schema.define(:version => 20130809124851) do
t.text "note"
t.string "noteable_type"
t.integer "author_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "project_id"
t.string "attachment"
t.string "line_code"
@@ -172,8 +172,8 @@ ActiveRecord::Schema.define(:version => 20130809124851) 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"
t.datetime "updated_at"
t.integer "creator_id"
t.string "default_branch"
t.boolean "issues_enabled", :default => true, :null => false
@@ -222,8 +222,8 @@ ActiveRecord::Schema.define(:version => 20130809124851) do
t.text "content", :limit => 2147483647
t.integer "author_id", :null => false
t.integer "project_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.string "file_name"
t.datetime "expires_at"
t.boolean "private", :default => true, :null => false
@@ -245,9 +245,6 @@ ActiveRecord::Schema.define(:version => 20130809124851) do
t.datetime "created_at"
end
add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
create_table "tags", :force => true do |t|
t.string "name"
end
@@ -279,29 +276,19 @@ ActiveRecord::Schema.define(:version => 20130809124851) do
end
create_table "users", :force => true do |t|
<<<<<<< HEAD
t.string "email", :default => "", :null => false
t.string "encrypted_password", :limit => 128, :default => "", :null => false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.integer "sign_in_count", :default => 0
=======
t.string "email", :default => "", :null => false
t.string "encrypted_password", :default => "", :null => false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.integer "sign_in_count", :default => 0
>>>>>>> 7984d3ca00edf45fed8bad6ed921060244970977
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.string "name"
<<<<<<< HEAD
t.boolean "admin", :default => false, :null => false
t.integer "projects_limit", :default => 10
t.string "skype", :default => "", :null => false
@@ -311,34 +298,15 @@ ActiveRecord::Schema.define(:version => 20130809124851) do
t.integer "theme_id", :default => 1, :null => false
t.string "bio"
t.integer "failed_attempts", :default => 0
=======
t.boolean "admin", :default => false, :null => false
t.integer "projects_limit", :default => 10
t.string "skype", :default => "", :null => false
t.string "linkedin", :default => "", :null => false
t.string "twitter", :default => "", :null => false
t.string "authentication_token"
t.integer "theme_id", :default => 1, :null => false
t.string "bio"
t.integer "failed_attempts", :default => 0
>>>>>>> 7984d3ca00edf45fed8bad6ed921060244970977
t.datetime "locked_at"
t.string "extern_uid"
t.string "provider"
t.string "username"
<<<<<<< HEAD
t.boolean "can_create_group", :default => true, :null => false
t.boolean "can_create_team", :default => true, :null => false
t.string "state"
t.integer "color_scheme_id", :default => 1, :null => false
t.integer "notification_level", :default => 1, :null => false
=======
t.boolean "can_create_group", :default => true, :null => false
t.boolean "can_create_team", :default => true, :null => false
t.string "state"
t.integer "color_scheme_id", :default => 1, :null => false
t.integer "notification_level", :default => 1, :null => false
>>>>>>> 7984d3ca00edf45fed8bad6ed921060244970977
t.datetime "password_expires_at"
t.integer "created_by_id"
t.datetime "last_credential_check_at"
@@ -347,7 +315,6 @@ ActiveRecord::Schema.define(:version => 20130809124851) do
add_index "users", ["admin"], :name => "index_users_on_admin"
add_index "users", ["authentication_token"], :name => "index_users_on_authentication_token", :unique => true
add_index "users", ["email"], :name => "index_users_on_email", :unique => true
add_index "users", ["extern_uid", "provider"], :name => "index_users_on_extern_uid_and_provider", :unique => true
add_index "users", ["name"], :name => "index_users_on_name"
add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
add_index "users", ["username"], :name => "index_users_on_username"
@@ -366,8 +333,8 @@ ActiveRecord::Schema.define(:version => 20130809124851) do
create_table "users_projects", :force => true do |t|
t.integer "user_id", :null => false
t.integer "project_id", :null => false
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.integer "project_access", :default => 0, :null => false
t.integer "notification_level", :default => 3, :null => false
end
@@ -379,8 +346,8 @@ ActiveRecord::Schema.define(:version => 20130809124851) do
create_table "web_hooks", :force => true do |t|
t.string "url"
t.integer "project_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.string "type", :default => "ProjectHook"
t.integer "service_id"
end