Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb

2014-03-18 11:15:01 +02: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

Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn into cirosantilli-rm-dir-prefix

2014-03-13 22:36:39 +02: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 dir prefix and suffix from tests inside dir.

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

browse_files.rb

Remove dir prefix and suffix from tests inside dir.

2014-02-23 10:34:39 +01: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

Merge branch 'rm-dir-prefix' of https://github.com/cirosantilli/gitlab-elearn into cirosantilli-rm-dir-prefix

2014-03-13 22:36:39 +02: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

Remove dir prefix and suffix from tests inside dir.

2014-02-23 10:34:39 +01: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

Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments

2014-03-13 23:11:16 +02:00

milestones.rb

Remove dir prefix and suffix from tests inside dir.

2014-02-23 10:34:39 +01: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

Fix 500 error when rename repository

2013-12-23 14:21:02 +02:00

public.rb

Remove dir prefix and suffix from tests inside dir.

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

redirects.rb

Merge branch 'improve/mr_diff'

2014-01-23 14:38:23 +02:00

search_code.rb

Remove dir prefix and suffix from tests inside dir.

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

services.rb

Remove dir prefix and suffix from tests inside dir.

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

snippets.rb

Remove dir prefix and suffix from tests inside dir.

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

team_management.rb

Remove dir prefix and suffix from tests inside dir.

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

wall.rb

Remove dir prefix and suffix from tests inside dir.

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

wiki.rb

Remove dir prefix and suffix from tests inside dir.

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