gitlabhq

mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 13:16:09 +10:00

Files

T

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

admin

Update ffaker gem

2015-05-20 19:22:00 -04:00

atom

Merge branch 'atom-xhtml-squashed' into 'master'

2015-03-17 08:38:38 +00:00

security

Test license blocking changes.

2015-05-05 13:20:40 +02:00

gitlab_flavored_markdown_spec.rb

Make use of to_reference in more specs