Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream ...

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

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb

2014-10-14 18:23:51 +03:00

..

commits

Use short_id instead of [0..N] for short version of commit sha

2014-10-10 15:39:48 +03:00

issues

Refactor task list tests and coffeescript

2014-10-06 19:19:12 -05:00

source

Make new and edit file submit more uniform

2014-10-08 10:01:07 +02:00

active_tab.rb

Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step

2014-09-22 20:56:12 +03:00

archived.rb

Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step

2014-09-22 20:56:12 +03:00

create.rb

Make Spinach test names consistent

2014-10-05 18:21:11 +02:00

deploy_keys.rb

Fix MR spinach tests

2014-01-23 12:55:43 +02:00

fork.rb

Make Spinach test names consistent

2014-10-05 18:21:11 +02:00

forked_merge_requests.rb

Remove def project from tests that inherit it.

2014-09-28 13:44:04 +02:00

graph.rb

Add tests for commits graph

2014-09-29 12:11:53 +03:00

hooks.rb

Remove unnecessary page. from tests.

2014-09-26 09:51:17 +02:00

issue_tracker.rb

Merge branch 'spinach-step' of https://github.com/cirosantilli/gitlabhq into cirosantilli-spinach-step

2014-09-22 20:56:12 +03:00

merge_requests.rb

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

network_graph.rb

Remove unnecessary page. from tests.

2014-09-26 09:51:17 +02:00

project_group_links.rb

Add feature test for project share

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

project_shortcuts.rb

Prefix Spinach features with Spinach::Features::.

2014-09-22 16:30:25 +02:00

project.rb

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

redirects.rb

Remove unnecessary page. from tests.

2014-09-26 09:51:17 +02:00

services.rb

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

snippets.rb

Remove def project from tests that inherit it.

2014-09-28 13:44:04 +02:00

star.rb

Remove unnecessary page. from tests.

2014-09-26 09:51:17 +02:00

team_management.rb

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +03:00

wiki.rb

Factor current_url + URI.path into current_path.

2014-09-23 21:56:38 +02:00