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

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb

2014-06-17 10:53:44 +03:00

..

active_tab.rb

Remove dir prefix and suffix from tests inside dir.

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

archived.rb

Remove dir prefix and suffix from tests inside dir.

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

browse_branches.rb

Fix branches tests

2014-05-24 14:20:12 +03:00

browse_commits_user_lookup.rb

Remove dir prefix and suffix from tests inside dir.

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

browse_commits.rb

Remove failing test on travis+pg

2014-06-14 19:41:32 +03:00

browse_files.rb

Editing preview

2014-04-15 19:02:02 +04:00

browse_git_repo.rb

Remove dir prefix and suffix from tests inside dir.

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

browse_tags.rb

Remove dir prefix and suffix from tests inside dir.

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

comments_on_commit_diffs.rb

Replace commit diff note request specs with spinach features

2013-01-15 00:52:57 +01:00

comments_on_commits.rb

Replace commit note request specs with spinach features

2013-01-15 00:52:55 +01:00

create.rb

Fix project creation test

2014-03-14 12:19:02 +02:00

deploy_keys.rb

Fix MR spinach tests

2014-01-23 12:55:43 +02:00

filter_labels.rb

Remove dir prefix and suffix from tests inside dir.

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

fork.rb

Remove dir prefix and suffix from tests inside dir.

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

forked_merge_requests.rb

Dont allow mr compare with empty branches

2014-05-08 19:00:03 +03:00

graph.rb

Remove dir prefix and suffix from tests inside dir.

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

hooks.rb

Remove dir prefix and suffix from tests inside dir.

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

issue_tracker.rb

Remove dir prefix and suffix from tests inside dir.

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

issues.rb

Add feature spec.

2014-05-26 20:43:58 +02:00

labels.rb

Remove dir prefix and suffix from tests inside dir.

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

markdown_render.rb

Update wiki tests.

2014-03-17 13:06:27 +01:00

merge_requests.rb

Fix for test with new form of MR.

2014-05-15 13:39:27 +02:00

milestones.rb

Fix tests

2014-06-04 20:39:43 +03:00

multiselect_blob.rb

Remove dir prefix and suffix from tests inside dir.

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

network_graph.rb

Remove dir prefix and suffix from tests inside dir.

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

project_browse_branches.rb

Fixed 500 error on branch and tag creation via UI

2014-02-25 09:35:09 +02:00

project_group_links.rb

Add feature test for project share

2013-10-16 14:17:58 +03:00

project.rb

Add tests for template mr description.

2014-05-14 15:24:14 +02:00

public.rb

Remove dir prefix and suffix from tests inside dir.

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

redirects.rb

Make use of project factory traits

2014-03-19 05:15:24 -04:00

search_code.rb

Remove dir prefix and suffix from tests inside dir.

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

services.rb

Add tests and documentation for jira service.

2014-05-13 13:48:55 +02:00

snippets.rb

Refactor snippets views

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

team_management.rb

Remove dir prefix and suffix from tests inside dir.

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

wiki.rb

Unstub after the test is done.

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