Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce ...

Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb

2015-01-08 20:37:35 -08:00

..

commits

Fix Markdown preview tests

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

issues

Add new Markdown preview test

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

source

Add tests for disabled blob edit button cases.

2014-12-30 18:19:48 +01:00

active_tab.feature

UI improvements mostly for mobile screens

2014-12-02 11:31:57 +02: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

edit_issuetracker.feature

Add trailing newline to all text files.

2014-06-21 11:20:22 +02: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

Factor audit events tests.

2014-11-24 09:01:01 +01:00

redirects.feature

Add in the tests.

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

service.feature

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -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