Dmitriy Zaporozhets 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb

2014-01-21 18:15:49 +02:00

..

commits

Conventional naming for diff modes.

2013-11-27 09:00:14 +01:00

issues

rewrite issues search test to prevent ajax requests running after test

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

source

Enable multiline select for blobs.

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

active_tab.feature

Fixed sub navs spinach tests for project

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

archived_projects.feature

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

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

create_project.feature

Test.

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

deploy_keys.feature

Feature tests for deploy keys

2013-05-06 15:09:41 +03:00

edit_issuetracker.feature

Preselect the current issue tracker with selected="selected"

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

fork_project.feature

updated fork feature to use gitlab-shell for v5 of gitlab

2013-04-15 01:54:52 -04:00

forked_merge_requests.feature

Remove commented tests since nobody is going to fix them

2013-09-11 22:50:08 +03:00

graph.feature

Its better to load graph with ajax since it requires ~10 seconds for bigger projects to finish up

2013-06-05 15:50:11 +03:00

group_links.feature

Add feature test for project share

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

hooks.feature

Move ProjectHooks from spec/requests to spinach

2012-09-27 23:52:08 +03:00

merge_requests.feature

Tests for accept MR with custom message

2014-01-14 11:49:54 +02:00

network.feature

type_fix_for_project_network_graph

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

project.feature

Fix 500 error when rename repository

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

public_projects.feature

Internally public projects

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

redirects.feature

Fix 404 on project page for unauthenticated user

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

service.feature

Add spinach tests for email on push service

2013-12-17 16:29:08 +02:00

snippets.feature

Fix remove snippet test

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

team_management.feature

Lets fix tests

2013-06-22 23:57:29 +03:00

wall.feature

refactor feature steps

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

wiki.feature

Fix the Cancel button on the Edit Wiki page.

2013-03-19 21:36:09 -07:00