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

..

active_tab.rb

Remove unnecessary page. from tests.

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

admin.rb

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

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

authentication.rb

Replace old spinach step definitions with step.

2014-09-22 10:01:50 +02:00

diff_note.rb

Replace javascript:; links with buttons.

2014-09-22 21:01:19 +02:00

group.rb

Added public groups area to enhance searching and exploring of projects

2014-07-15 08:19:27 +02:00

markdown.rb

Refactor task list tests and coffeescript

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

note.rb

Add Spinach tests for task lists

2014-10-06 02:07:03 -05:00

paths.rb

Merge branch 'master' into ce-upstream

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

project_tab.rb

Explicitly require active teab for tests

2014-09-04 10:00:04 +03:00

project.rb

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

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

search.rb

Updating to persist a params snippets variable

2014-09-05 13:30:55 -04:00

shortcuts.rb

Awesome shortcuts for GitLab

2014-09-01 11:49:17 +02:00

snippet.rb

Snippets: public/internal/private

2014-10-09 17:09:53 +03:00

user.rb

Move destroy user feature to spec.

2014-07-17 23:22:40 +02:00