Dmitriy Zaporozhets f40b99d02e Merge branch 'master' into rubocop-for-tests ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/issues_spec.rb spec/models/forked_project_link_spec.rb spec/models/hooks/service_hook_spec.rb spec/models/hooks/web_hook_spec.rb spec/models/project_services/hipchat_service_spec.rb spec/requests/api/project_members_spec.rb spec/requests/api/projects_spec.rb spec/requests/api/system_hooks_spec.rb spec/services/archive_repository_service_spec.rb spec/support/matchers.rb spec/tasks/gitlab/backup_rake_spec.rb		2015-06-23 10:44:03 +02:00
..
admin	Remove show actions from Admin and Project DeployKeys	2015-06-03 18:03:04 -04:00
dashboard	Fix tests for group leave feature	2015-05-29 15:07:04 +02:00
explore	Fix spinach tests	2014-12-24 14:34:37 +02:00
profile	Move the "Design" templates and logic to Preferences	2015-06-13 17:58:16 -04:00
project	Merge branch 'revert-mr-state-names'	2015-06-22 15:43:09 +02:00
snippets	Fix Error 500 when one user attempts to access a personal, internal snippet	2015-06-19 21:23:46 -07:00
steps	Merge branch 'master' into rubocop-for-tests	2015-06-23 10:44:03 +02:00
support	Started on the actual rspec 3 upgrade	2015-06-22 12:12:49 +02:00
groups.feature	Add feature tests for inviting members.	2015-04-14 12:08:11 +02:00
invites.feature	Add spinach tests around accepting and declining invitations.	2015-04-14 18:04:29 +02:00
search.feature	Fix Error 500 when searching Wiki pages	2015-04-30 08:54:08 -07:00
snippet_search.feature	Updating to persist a params snippets variable	2014-09-05 13:30:55 -04:00
user.feature	Refactor contributions events and write tests for calendar	2015-03-22 13:55:00 -07:00