Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 ...

Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

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

2013-11-29 10:01:43 +02:00

..

commits

Fix bug with rendering changing images in commits

2013-09-11 18:53:37 -08:00

issues

rewrite issues search test to prevent ajax requests running after test

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

source

Feature test for New file feature

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

active_tab.feature

Fixed sub navs spinach tests for project

2013-06-19 22:52:57 +03: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

Merge Request on forked projects

2013-07-17 22:41:30 -04:00

network.feature

Render not found when failing to look for a commit

2013-08-21 17:53:51 +09:00

project.feature

Fix project.show spinach test

2013-06-04 17:01:41 +03:00

public_projects.feature

Internally public projects

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

service.feature

Added Flowdock integration support via a service.

2013-09-29 20:31:08 +03: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