 Dmitriy Zaporozhets
|
f5d3e47e39
|
Hide ldap group links if ldap is not enabled
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-12-08 15:45:55 +02:00 |
|
 Marin Jankovski
|
6bcb1a033f
|
Add removal and addition of the user to the group membership to audit events.
|
2014-11-21 16:51:06 +01:00 |
|
|
Marin Jankovski
|
b68e1123fb
|
Move event creation to service.
|
2014-11-21 12:32:12 +01:00 |
|
|
Marin Jankovski
|
e348c6512f
|
Add group audit events.
|
2014-11-20 08:54:49 +01:00 |
|
 Valery Sizov
|
e769822595
|
Merge branch '7-4-stable' into to_ee_stable_from_ce_stable
Conflicts:
config/initializers/1_settings.rb
config/initializers/7_omniauth.rb
features/admin/groups.feature
features/steps/admin/groups.rb
|
2014-10-20 19:59:36 +03:00 |
|
|
Dmitriy Zaporozhets
|
644fd232db
|
Add tests for remove group member feature in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-10-20 16:37:52 +03:00 |
|
 Jan-Willem van der Meer
|
83a3facb17
|
Add provider to LDAP group links
|
2014-10-10 16:16:29 +02:00 |
|
|
Dmitriy Zaporozhets
|
a5972170ad
|
Merge remote-tracking branch 'origin/master' into ee-7-4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/projects/team_members_controller.rb
app/finders/projects_finder.rb
app/models/group.rb
app/models/project_team.rb
app/models/users_group.rb
config/gitlab.yml.example
config/initializers/1_settings.rb
config/routes.rb
db/schema.rb
doc/integration/ldap.md
features/steps/group.rb
features/steps/project/project.rb
|
2014-10-02 13:24:59 +03:00 |
|
 Jacob Vosmaer
|
f13bcb2b45
|
Fix LdapGroupLink error message
ActiveModel::Validations has an 'errors' attribute, but no 'error'.
|
2014-09-15 14:26:26 +02:00 |
|
|
Dmitriy Zaporozhets
|
1aa48174db
|
Fix STI+polymorphic for Group <-> GroupMember
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-09-14 21:52:54 +03:00 |
|
|
Jan-Willem van der Meer
|
efafbd1746
|
Respond with the error message on failure
|
2014-09-04 11:02:14 +02:00 |
|
|
Jan-Willem van der Meer
|
bac04b220b
|
admin group edits now redirect to group#show on success
|
2014-09-01 10:05:37 +02:00 |
|
|
Jan-Willem van der Meer
|
89f25ffae7
|
Render correct layout, css fix empty state of ldap links
Fixes #157
|
2014-09-01 09:25:10 +02:00 |
|
|
Jan-Willem van der Meer
|
e519963876
|
Refactor group/edit LDAP sync page
|
2014-08-14 17:52:28 +02:00 |
|
|
Jan-Willem van der Meer
|
08fda6a263
|
Add missing ldap_group_links controller
|
2014-08-14 13:18:32 +02:00 |
|
|
Dmitriy Zaporozhets
|
a74b66cdee
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/models/group.rb
app/models/project.rb
features/steps/shared/project.rb
|
2014-07-10 23:43:42 +03:00 |
|
 Marin Jankovski
|
3b5722bca9
|
Improve performance, ordering and pagination for group milestones.
|
2014-07-04 11:57:24 +02:00 |
|
|
Marin Jankovski
|
3e52517da1
|
Add feature tests for group milestone.
|
2014-06-30 16:18:26 +02:00 |
|
|
Marin Jankovski
|
d3796b84f8
|
Show all issues and merge requests that could be considered opened or closed, includes reopened and merged.
|
2014-06-30 12:41:27 +02:00 |
|
|
Marin Jankovski
|
d145f09cd6
|
Correct authorization for group milestones.
|
2014-06-30 11:38:03 +02:00 |
|
|
Marin Jankovski
|
e66a8b4cda
|
Move milestone link in group head, 2 column milestone for MR and issues.
|
2014-06-30 11:13:24 +02:00 |
|
|
Marin Jankovski
|
c223fb1a96
|
Start building group milestone show page.
|
2014-06-30 09:45:16 +02:00 |
|
|
Marin Jankovski
|
b6425f33bc
|
Get one group milestone based on milestone title.
|
2014-06-30 09:44:30 +02:00 |
|
|
Marin Jankovski
|
f0af302c83
|
Close and reopen group milestones.
|
2014-06-30 09:44:30 +02:00 |
|
|
Marin Jankovski
|
4ca8a175a2
|
Filter group milestones.
|
2014-06-30 09:44:30 +02:00 |
|
|
Marin Jankovski
|
0723bf1afa
|
Move group milestone processing from service to model.
|
2014-06-30 09:44:30 +02:00 |
|
|
Marin Jankovski
|
58570880f0
|
Create group milestones service.
|
2014-06-30 09:44:30 +02:00 |
|
|
Marin Jankovski
|
e1afea777a
|
Show title of milestone.
|
2014-06-30 09:44:30 +02:00 |
|
|
Marin Jankovski
|
ca6fd8841e
|
Add group milestones routes and controller.
|
2014-06-30 09:42:28 +02:00 |
|
|
Dmitriy Zaporozhets
|
37723dc623
|
UI and controller for group members access reset
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-02-20 12:26:48 +02:00 |
|
 Steven Thonus
|
251df827a5
|
added group avatars
|
2014-01-28 08:38:00 +01:00 |
|