Dmitriy Zaporozhets 1f43fa20d3 Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce ...

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

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/controllers/application_controller.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.2-to-6.3.md

2013-12-23 12:57:22 +02: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_project.rb

Test.

2013-09-13 11:37:13 +02:00

deploy_keys.rb

MR on fork: Email fixes, style fixes

2013-07-17 22:46:38 -04:00

project_active_tab.rb

Fixed sub navs spinach tests for project

2013-06-19 22:52:57 +03:00

project_archived.rb

Archiving old projects; archived projects aren't shown on dashboard

2013-12-16 14:39:14 +01:00

project_browse_branches.rb

Fix tests

2013-07-18 14:11:17 +03:00

project_browse_commits.rb

Button name has an upcase in it.

2013-11-27 17:57:55 +01:00

project_browse_files.rb

Feature test for New file feature

2013-11-05 10:45:23 +02:00

project_browse_git_repo.rb

Team features are green now

2013-02-21 12:27:52 +02:00

project_browse_tags.rb

refactor feature steps

2012-09-10 08:35:03 -07:00

project_fork.rb

MR on fork: Email fixes, style fixes

2013-07-17 22:46:38 -04:00

project_forked_merge_requests.rb

Fix feature test

2013-09-11 20:27:50 +03:00

project_graph.rb

Solve inconsistency between network graph & stat graphs

2013-06-11 09:54:01 +03:00

project_group_links.rb

Add feature test for project share

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

project_hooks.rb

Remove backward compatibility of factories.

2012-11-13 22:27:45 +11:00

project_issue_tracker.rb

Preselect the current issue tracker with selected="selected"

2013-11-01 15:33:47 +01:00

project_issues.rb

rewrite issues search test to prevent ajax requests running after test

2013-09-27 16:25:24 +03:00

project_labels.rb

Remove backward compatibility of factories.

2012-11-13 22:27:45 +11:00

project_markdown_render.rb

Links in Readme in tree view.

2013-10-14 16:47:46 +02:00

project_merge_requests.rb

Prevent 500 error if cant detect branches for commit

2013-10-23 19:29:29 +03:00

project_milestones.rb

Fixed tests. Fixed overrided scope. Better usability for milestone view

2013-06-17 11:57:37 +03:00

project_multiselect_blob.rb

Enable multiline select for blobs.

2013-11-27 20:08:37 -06:00

project_network_graph.rb

type_fix_for_project_network_graph

2013-11-30 17:27:02 +01:00

project_search_code.rb

changed Gitlab to GitLab

2013-05-19 02:13:39 -07:00

project_services.rb

Rename Services to Project services

2013-12-18 16:27:52 +02:00

project_snippets.rb

Fix remove snippet test

2013-09-25 21:33:35 +03:00

project_team_management.rb

Fix spinach tests

2013-08-27 13:14:55 +03:00

project_wall.rb

fix incorrectly moved spinach step

2013-03-19 17:53:21 +02:00

project_wiki.rb

fix tests

2013-08-08 10:27:52 +03:00

project.rb

Dont load bootstrap buttons. Modified css with new buttons

2013-08-01 22:35:40 +03:00

public_projects.rb

Internally public projects

2013-05-02 00:06:59 -07:00

redirects.rb

Fix 404 on project page for unauthenticated user

2013-12-04 13:10:20 -06:00