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

Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb

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

..

commits

Change always passing visible true tests to false.

2015-01-02 00:20:19 +01:00

issues

Add new Markdown preview test

2014-10-18 18:07:46 -05:00

source

WebEditor: save to new branch: spinach

2015-02-24 11:43:20 +02:00

active_tab.feature

Fix active tab tests

2015-02-19 17:24:34 -08:00

archived.feature

Remove dir prefix and suffix from tests inside dir.

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

create.feature

Make Spinach test names consistent

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

deploy_keys.feature

Feature tests for deploy keys

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

fork.feature

Improve fork to namespaces feature

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

forked_merge_requests.feature

Revert "gitlab shell works if multiple rubies installed"

2014-11-18 17:14:36 +02: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' into ce-changes

2014-12-11 18:12:45 +02:00

network_graph.feature

Make Spinach test names consistent

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

project.feature

Fix Spinach test

2015-02-28 07:34:16 -07: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

Make Spinach test names consistent

2014-10-05 18:21:11 +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

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

wiki.feature

Unstub after the test is done.

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