Dmitriy Zaporozhets fae2e540b6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 ...

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

Conflicts:
	CHANGELOG
	Gemfile.lock
	README.md
	VERSION
	app/assets/javascripts/application.js
	db/schema.rb
	doc/install/installation.md
	doc/update/4.2-to-5.0.md
	doc/update/5.0-to-5.1.md
	doc/update/5.1-to-5.2.md
	doc/update/5.2-to-5.3.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.0-to-6.7.md
	lib/gitlab/git_access.rb

2014-04-10 13:34:56 +03:00

..

commits

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

issues

Add issue to an empty repo, test.

2014-04-08 17:12:57 +02:00

source

Blob and tree gfm links to anchors work.

2014-02-23 09:47:52 +01:00

active_tab.feature

Fixed sub navs spinach tests for project

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

archived.feature

Remove dir prefix and suffix from tests inside dir.

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

create.feature

Fix project creation test

2014-03-14 12:19:02 +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.feature

Remove dir prefix and suffix from tests inside dir.

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

forked_merge_requests.feature

By default, target original repository if fork when creating new MR.

2014-02-24 22:06:25 +01: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

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

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.feature

Remove dir prefix and suffix from tests inside dir.

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

redirects.feature

Fix 404 on project page for unauthenticated user

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

service.feature

Added Slack service integration.

2014-03-18 18:54:30 +01: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