Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee ...

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

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb

2015-06-05 11:40:36 +02:00

..

backend

Remove Rack Attack monkey patches and bump to version 4.3.0

2015-05-22 16:25:03 -04:00

bitbucket_import

Make sure user has access to namespace in import tests.

2015-04-15 16:58:43 +02:00

diff

Use project.commit convenience method.

2015-04-24 12:29:36 +02:00

github_import

Make sure user has access to namespace in import tests.

2015-04-15 16:58:43 +02:00

gitlab_import

Make sure user has access to namespace in import tests.

2015-04-15 16:58:43 +02:00

gitorious_import

Make sure user has access to namespace in import tests.

2015-04-15 16:58:43 +02:00

google_code_import

Show incompatible projects in Google Code import status

2015-04-30 06:56:49 -07:00

kerberos

Update spec per rspec 2.99 requirements.

2015-02-16 13:11:39 -08:00

ldap

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-05-13 14:10:14 +03:00

markdown

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

o_auth

add common method to force utf8 and force oauth properties to be utf8

2015-05-03 00:43:46 +03:00

satellite

Update spec per rspec 2.99 requirements.

2015-02-16 13:11:39 -08:00

asciidoc_spec.rb

Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263)

2015-05-18 20:48:03 +02:00

auth_spec.rb

Kerberos: specs

2014-12-15 18:06:17 +02:00

closing_issue_extractor_spec.rb

Fix ClosingIssueExtractor specs

2015-05-26 15:55:26 -04:00

git_access_spec.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-05-15 13:29:58 +03:00

git_access_wiki_spec.rb

Refactor GitAccess to use instance variables.

2015-03-24 14:11:48 +01:00

key_fingerprint_spec.rb

Refactor key fingerprint generation.

2015-04-14 12:00:43 +02:00

markup_helper_spec.rb

Simplify and unify helpers for rendering markup

2015-05-18 22:52:13 +02:00

note_data_builder_spec.rb

Added comment notification events to HipChat and Slack services.

2015-03-06 06:54:00 -08:00

popen_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00

push_data_builder_spec.rb

Extend project web hooks with more data

2015-02-20 10:27:37 -08:00

reference_extractor_spec.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

regex_spec.rb

Fix (project_)name_regex to accept non-ASCII letters and dash

2015-04-27 16:38:47 +02:00

upgrader_spec.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-06-05 11:40:36 +02:00

url_builder_spec.rb

Added comment notification events to HipChat and Slack services.

2015-03-06 06:54:00 -08:00

version_info_spec.rb

Updated rspec to rspec 3.x syntax

2015-02-12 19:17:35 +01:00