gitlabhq

mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00

Files

T

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

accounts_controller.rb

Move profile account to separate controller

2013-10-09 16:43:17 +03:00

avatars_controller.rb

Expire event cache on avatar creation/removal

2013-12-11 09:30:22 -06:00

emails_controller.rb

Make app works with strong params

2014-06-26 23:24:17 +03:00

groups_controller.rb

Huge replace of old users_project and users_group references