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

..

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_browse_branches.rb

Fix tests

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

project_browse_commits.rb

Fix bug with rendering changing images in commits

2013-09-11 18:53:37 -08: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_network_graph.rb

Drop support of root namespace in routing

2013-09-13 07:00:24 +09:00

project_search_code.rb

changed Gitlab to GitLab

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

project_services.rb

Added Flowdock integration support via a service.

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