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

..

commits

Fix spinach feature

2014-09-26 18:12:25 +03:00

issues

Remove duplicated labels step

2014-09-12 07:22:30 +02:00

source

Titleize blob action buttons.

2014-09-30 23:32:03 +02:00

active_tab.feature

Delete wall notes tests

2014-06-13 14:29:26 +03:00

archived.feature

Remove dir prefix and suffix from tests inside dir.

2014-02-23 10:34:39 +01:00

create.feature

Fix project creation test

2014-03-14 12:19:02 +02:00

deploy_keys.feature

Feature tests for deploy keys

2013-05-06 15:09:41 +03:00

edit_issuetracker.feature

Add trailing newline to all text files.

2014-06-21 11:20:22 +02:00

fork.feature

Remove dir prefix and suffix from tests inside dir.

2014-02-23 10:34:39 +01:00

forked_merge_requests.feature

Fix form mr tests

2014-07-31 20:13:27 +03:00

graph.feature

Add tests for commits graph

2014-09-29 12:11:53 +03:00

group_links.feature

Add feature test for project share

2013-10-16 14:17:58 +03:00

hooks.feature

Prevent 500 if hook url is down, fixes #7376

2014-07-29 11:49:46 +02:00

merge_requests.feature

Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre

2014-09-15 11:24:51 +02:00

network.feature

Fix network tests

2014-07-31 22:34:37 +03:00

project.feature

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

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

redirects.feature

Add in the tests.

2014-07-11 19:53:10 +02:00

service.feature

Add tests and documentation for jira service.

2014-05-13 13:48:55 +02:00

shortcuts.feature

Change shortcut for activity to project, because navbar changed

2014-09-08 20:49:15 +02:00

snippets.feature

Refactor snippets views

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

star.feature

Fix star tests

2014-07-24 23:25:38 +03:00

team_management.feature

Add shared group members listing feature.

2014-08-26 12:39:19 +02:00

wiki.feature

Unstub after the test is done.

2014-05-07 11:52:07 +02:00