Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee ...

# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb

2015-05-05 10:18:27 +02:00

..

commits

Fix code unfold not working on Compare commits page

2015-03-24 00:19:41 -07:00

issues

Move current user to the top of the list in author/assignee filters

2015-04-09 01:04:53 -07: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 tests for un-existing page

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

audit_event.feature

deploy key events: tests

2015-03-24 15:58:02 +02:00

create.feature

Make Spinach test names consistent

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

deploy_keys.feature

Add project deploy keys tests.

2015-04-03 12:40:14 +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 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-14 13:05:39 +03:00

network_graph.feature

Make Spinach test names consistent

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

project.feature

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

2015-05-05 10:18:27 +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

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

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 bug where Wiki pages that include a '/' were no longer accessible

2015-04-07 09:10:11 -07:00