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

..

admin

Add ability to remove the branded page logo.

2014-09-26 14:52:11 +02:00

dashboard

Awesome shortcuts for GitLab

2014-09-01 11:49:17 +02:00

explore

Tests for trending/starred pages

2014-07-26 10:33:42 +03:00

profile

Splitted the Spinach tests to prevent time-outs

2014-06-04 22:55:27 +02:00

project

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +03:00

snippets

Refactor snippets views

2014-06-14 12:36:46 +03:00

steps

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +03:00

support

Try wear_merged! without argument

2014-10-01 11:43:16 +03:00

group.feature

Add integration test for new LDAP sync

2014-08-15 10:32:30 +02:00

search.feature

Save search options when switch between filter

2014-08-27 11:55:42 +03:00

snippet_search.feature

Updating to persist a params snippets variable

2014-09-05 13:30:55 -04:00

user.feature

Add admin notification unsubscribe feature

2014-08-22 10:45:45 +02:00