home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,383 Commits 48 Branches 340 Tags
4bed25b1e1a8a66cc151dfcf5600a68b8d6c407e
Commit Graph
62 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Dmitriy Zaporozhets cef746dc94 User should be able to leave group. If not - show him proper message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 14:12:30 +02:00
Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb
 2015-05-05 10:18:27 +02:00
Douwe Maan 92fd3ccee0 Add helpers for header title and sidebar, and move setting those from controllers to layouts. 2015-05-01 10:39:16 +02:00
Douwe Maan a3bd323cd3 Remove an old determine_layout call. 2015-04-30 20:02:00 +02:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Dmitriy Zaporozhets 9148819323 Rename before_filter to before_action 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-24 12:53:33 +03:00
Dmitriy Zaporozhets f502b293e5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	spec/helpers/gitlab_markdown_helper_spec.rb
 2015-04-24 11:22:54 +03:00
Jeroen van Baarsen 5a4ebfb47a Fixed the Rails/ActionFilter cop 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-04-20 15:39:37 +02:00
Dmitriy Zaporozhets 135372849d Fix conflict 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-15 20:22:23 +03:00
Dmitriy Zaporozhets d01d0c02b7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/deploy_keys_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_team.rb
	app/models/service.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/admin/groups/show.html.haml
	app/views/groups/group_members/_new_group_member.html.haml
	config/initializers/1_settings.rb
	db/schema.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/reference_extractor_spec.rb
 2015-04-15 19:22:57 +03:00
Douwe Maan cb5362e7ce Follow newline guidelines. 2015-04-14 15:16:00 +02:00
Douwe Maan 1b5c483d89 Consistently use "invitation" rather than "invite" in text. 2015-04-14 12:25:16 +02:00
Douwe Maan 2a45eb6a91 Use notice flash type rather than nonexistent info. 2015-04-14 12:08:11 +02:00
Douwe Maan 453340d449 Let membership invitations be resent. 2015-04-14 12:08:10 +02:00
Douwe Maan 90dafe31c4 Only show invited users to people who can admin group. 2015-04-14 12:07:33 +02:00
Douwe Maan 2b2bd402dc Track who created a group or project member. 2015-04-14 12:06:42 +02:00
Douwe Maan ff3caad4ca Rename manage_group ability to admin_group for consistency with project. 2015-04-14 12:05:49 +02:00
Douwe Maan 368ed5ad27 Use new group members route. 2015-04-06 22:44:19 +02:00
Dmitriy Zaporozhets d3361e6d1b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/application_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/team_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/helpers/projects_helper.rb
	app/helpers/tab_helper.rb
	app/models/application_setting.rb
	app/models/user.rb
	app/views/devise/shared/_signin_box.html.haml
	app/views/groups/projects.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/projects/team_members/_form.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
	db/schema.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2015-03-16 21:25:00 -07:00
Douwe Maan 84371de01f Move group leave action from dashboard/groups to groups/group_members. 2015-03-15 13:52:28 +01:00
Douwe Maan 224187ffb9 Move group members index from /members to /group_members. 2015-03-15 13:51:11 +01:00
Douwe Maan 99f995755e Use group_member instead of users_group or membership. 2015-03-15 13:49:41 +01:00
Dmitriy Zaporozhets f0cbbd70bb Use same constant for amount of items per page 2015-03-12 15:37:00 -07:00
Valery Sizov d77285999b Web hook: controller refactoring 2015-03-12 20:51:38 +02:00
Valery Sizov 57875720ab Group level webhooks 2015-03-12 20:46:10 +02:00
Valery Sizov e3df22f224 Merge remote-tracking branch 'dev/master' into ce_upstream1 2015-03-12 18:39:24 +02:00
Valery Sizov 0b38c3e041 group controller refactoring 2015-03-12 17:08:48 +02:00
Dmitriy Zaporozhets be4d340381 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb
 2015-03-11 18:41:41 -07:00
Douwe Maan fbc3cb69c3 Add dashboard milestones. 2015-03-03 16:19:37 +01:00
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
Dmitriy Zaporozhets 2064a14724 Add tests for remove group member feature in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 13:18:07 +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