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
d5a92b4c
Commit
d5a92b4c
authored
Nov 04, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Visible group option
parent
7680ada3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
3 deletions
+20
-3
CHANGELOG-EE
CHANGELOG-EE
+1
-0
app/assets/javascripts/groups_select.js.coffee
app/assets/javascripts/groups_select.js.coffee
+8
-2
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+6
-0
app/helpers/selects_helper.rb
app/helpers/selects_helper.rb
+1
-1
config/routes.rb
config/routes.rb
+4
-0
No files found.
CHANGELOG-EE
View file @
d5a92b4c
...
...
@@ -4,6 +4,7 @@ v 8.2.0
- When someone as marked as a required approver for a merge request, an email should be sent
- Allow configuring the Jira API path (Alex Lossent)
- Fix "Rebase onto master"
- Allow groups to appear in the `Share with group` share if the group owner allows it
v 8.1.0 (unreleased)
- added an issues template (Hannes Rosenögger)
...
...
app/assets/javascripts/groups_select.js.coffee
View file @
d5a92b4c
class
@
GroupsSelect
constructor
:
->
$
(
'.ajax-groups-select'
).
each
(
i
,
select
)
=>
skip_ldap
=
$
(
select
).
hasClass
(
'skip_ldap'
)
skip_group
=
$
(
select
).
data
(
"skip-group"
)
url
=
$
(
select
).
data
(
"url"
)
$
(
select
).
select2
placeholder
:
"Search for a group"
multiple
:
$
(
select
).
hasClass
(
'multiselect'
)
minimumInputLength
:
0
query
:
(
query
)
->
Api
.
groups
query
.
term
,
skip_ldap
,
(
groups
)
->
$
.
ajax
(
url
:
url
data
:
search
:
query
.
term
per_page
:
20
dataType
:
"json"
).
done
(
groups
)
->
data
=
{
results
:
[]
}
for
group
in
groups
...
...
app/controllers/groups_controller.rb
View file @
d5a92b4c
...
...
@@ -93,6 +93,12 @@ class GroupsController < Groups::ApplicationController
redirect_to
root_path
,
alert:
"Group '
#{
@group
.
name
}
' was successfully deleted."
end
def
autocomplete
groups
=
GroupsFinder
.
new
.
execute
(
current_user
).
search
(
params
[
:search
]).
limit
(
params
[
:per_page
])
render
json:
groups
.
to_json
end
protected
def
group
...
...
app/helpers/selects_helper.rb
View file @
d5a92b4c
...
...
@@ -49,7 +49,7 @@ module SelectsHelper
css_class
<<
(
opts
[
:class
]
||
''
)
value
=
opts
[
:selected
]
||
''
hidden_field_tag
(
id
,
value
,
class:
css_class
,
data:
{
skip_group:
opts
[
:skip_group
]
})
hidden_field_tag
(
id
,
value
,
class:
css_class
,
data:
{
skip_group:
opts
[
:skip_group
]
,
url:
autocomplete_groups_path
})
end
def
admin_email_select_tag
(
id
,
opts
=
{})
...
...
config/routes.rb
View file @
d5a92b4c
...
...
@@ -366,6 +366,10 @@ Gitlab::Application.routes.draw do
get
:projects
end
collection
do
get
:autocomplete
end
scope
module: :groups
do
resource
:ldap
,
only:
[]
do
member
do
...
...
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