Dmitriy Zaporozhets c84b14d2a1 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/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature

2015-07-14 15:40:46 +02:00

..

commits

Fix features syntax

2015-06-22 12:13:45 +02:00

issues

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00

source

Refactor rake tasks for tests

2015-06-23 16:48:52 +02:00

active_tab.feature

Move Project Members link from Settings to main menu.

2015-06-09 14:45:38 +02:00

archived.feature

Remove tests for un-existing page

2015-03-10 23:34:18 -07:00

audit_event.feature

Move audit tests for project in separate class

2015-07-03 12:43:54 +02:00

create.feature

Make Spinach test names consistent

2014-10-05 18:21:11 +02:00

deploy_keys.feature

Don't show duplicate deploy keys. Fixes #1516

2015-05-08 21:32:03 +02:00

fork.feature

Improve fork to namespaces feature

2014-11-14 16:06:39 +02:00

forked_merge_requests.feature

Fix "Project Forked Merge Requests" scenario

2015-06-26 22:41:02 -04:00

git_hooks.feature

Git hooks for checking email

2014-10-29 11:42:51 +02:00

graph.feature

Add tests for commits graph

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

group_links.feature

Fix tests for share project with group

2014-12-30 12:48:29 +02:00

hooks.feature

Prevent 500 if hook url is down, fixes #7376

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

merge_requests.feature

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

2015-07-02 17:07:02 +02:00

network_graph.feature

Make Spinach test names consistent

2014-10-05 18:21:11 +02:00

project.feature

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-07-14 15:40:46 +02:00

redirects.feature

Add in the tests.

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

service.feature

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-03-02 16:10:12 -08:00

shortcuts.feature

Fix schortcut tests

2015-07-08 17:36:31 +02:00

snippets.feature

Refactor snippets views

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

star.feature

Refactor star btn logic for non-logged in user and fix tests

2015-03-29 18:50:45 -07:00

team_management.feature

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-27 11:53:31 +03:00

wiki.feature

Fix features syntax

2015-06-22 12:13:45 +02:00