Commit Graph
5 Commits
Author SHA1 Message Date
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
Marin Jankovski 95649362ad Create the admin email select box which queries through both projects and groups. 2015-01-09 13:13:10 +01:00
Jan-Willem van der Meer cd45fd7011 Test basic email flow 2014-08-11 09:54:12 +02:00
Jan-Willem van der Meer 71f7675cd9 Display list of recipientgroups properly
- Use html5 validation
- initiate create action
2014-08-08 20:47:08 +02:00
Jan-Willem van der Meer 3b98830f7e Give Admin email an interface 2014-08-08 17:13:04 +02:00