Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b017947a
Commit
b017947a
authored
Aug 13, 2014
by
Jan-Willem van der Meer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename ldap_groups to ldap_group_links
parent
b22546df
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
app/models/group.rb
app/models/group.rb
+1
-1
app/models/ldap_group_link.rb
app/models/ldap_group_link.rb
+1
-1
db/migrate/20140813133925_rename_ldap_group_to_ldap_group_link.rb
...te/20140813133925_rename_ldap_group_to_ldap_group_link.rb
+5
-0
db/schema.rb
db/schema.rb
+2
-2
No files found.
app/models/group.rb
View file @
b017947a
...
...
@@ -21,7 +21,7 @@ class Group < Namespace
has_many
:users
,
through: :users_groups
has_many
:project_group_links
,
dependent: :destroy
has_many
:shared_projects
,
through: :project_group_links
,
source: :project
has_many
:ldap_groups
,
foreign_key:
'group_id'
has_many
:ldap_group
_link
s
,
foreign_key:
'group_id'
validates
:ldap_access
,
inclusion:
{
in:
UsersGroup
.
group_access_roles
.
values
},
...
...
app/models/ldap_group.rb
→
app/models/ldap_group
_link
.rb
View file @
b017947a
class
LdapGroup
<
ActiveRecord
::
Base
class
LdapGroup
Link
<
ActiveRecord
::
Base
belongs_to
:group
validates
:cn
,
uniqueness:
{
scope: :group_id
}
...
...
db/migrate/20140813133925_rename_ldap_group_to_ldap_group_link.rb
0 → 100644
View file @
b017947a
class
RenameLdapGroupToLdapGroupLink
<
ActiveRecord
::
Migration
def
change
rename_table
:ldap_groups
,
:ldap_group_links
end
end
db/schema.rb
View file @
b017947a
...
...
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
version:
20140813
090117
)
do
ActiveRecord
::
Schema
.
define
(
version:
20140813
133925
)
do
# These are extensions that must be enabled in order to support this database
enable_extension
"plpgsql"
...
...
@@ -128,7 +128,7 @@ ActiveRecord::Schema.define(version: 20140813090117) do
add_index
"keys"
,
[
"user_id"
],
name:
"index_keys_on_user_id"
,
using: :btree
create_table
"ldap_groups"
,
force:
true
do
|
t
|
create_table
"ldap_group
_link
s"
,
force:
true
do
|
t
|
t
.
string
"cn"
,
null:
false
t
.
integer
"group_access"
,
null:
false
t
.
integer
"group_id"
,
null:
false
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment