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

..

concerns

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

hooks

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

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

members

Re-annotate models

2015-05-03 13:38:27 -07:00

project_services

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

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

appearance_spec.rb

Use last appearance settings. Show last edit date

2014-04-14 22:14:51 +03:00

application_setting_spec.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

broadcast_message_spec.rb

Updated rspec to rspec 3.x syntax

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

commit_range_spec.rb

Update CommitRange#to_reference to use full SHAs

2015-05-26 15:48:31 -04:00

commit_spec.rb

Add to_reference for models that support references

2015-05-26 15:48:30 -04:00

deploy_key_spec.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

deploy_keys_project_spec.rb

Allow admin to create public deploy keys that are accessible to any project.

2015-04-03 12:23:20 +02:00

event_spec.rb

Updated rspec to rspec 3.x syntax

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

external_issue_spec.rb

Add to_reference for models that support references

2015-05-26 15:48:30 -04:00

external_wiki_service_spec.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

forked_project_link_spec.rb

Updated rspec to rspec 3.x syntax

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

git_hook_spec.rb

Remove mass-assigment tests

2014-07-11 16:07:20 +03:00

group_spec.rb

Add to_reference for models that support references

2015-05-26 15:48:30 -04:00

historical_data_spec.rb

Validate maximum active user count up until license issue date.

2015-05-21 18:49:24 +02:00

issue_spec.rb

Minor model spec cleanups

2015-05-26 15:48:30 -04:00

jira_issue_spec.rb

Update spec per rspec 2.99 requirements.

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

key_spec.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

label_link_spec.rb

Updated rspec to rspec 3.x syntax

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

label_spec.rb

Support only double quotes for multi-word label references

2015-05-26 15:49:20 -04:00

ldap_group_link_spec.rb

Adapt frontend to LdapGroupLink with provider

2014-10-10 21:50:54 +02:00

license_spec.rb

Rename issued_at to starts_at.

2015-05-21 19:50:57 +02:00

member_spec.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

merge_request_spec.rb

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

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

milestone_spec.rb

Change percent_complete rescue value from 100 to 0

2015-05-26 14:57:53 -04:00

namespace_spec.rb

Move files for moved namespaces.

2015-03-31 09:30:34 +02:00

note_spec.rb

Merge cross-reference refactoring with EE code

2015-05-13 14:39:57 +03:00

project_group_link_spec.rb

Remove mass-assigment tests

2014-07-11 16:07:20 +03:00

project_security_spec.rb

Updated rspec to rspec 3.x syntax

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

project_snippet_spec.rb

Updated rspec to rspec 3.x syntax

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

project_spec.rb

Add to_reference for models that support references

2015-05-26 15:48:30 -04:00

project_team_spec.rb

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

project_wiki_spec.rb

Updated rspec to rspec 3.x syntax

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

protected_branch_spec.rb

Updated rspec to rspec 3.x syntax

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

repository_spec.rb

Refactor repository specs

2015-03-22 11:01:45 -07:00

service_spec.rb

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

2015-05-05 10:18:27 +02:00

snippet_spec.rb

Minor model spec cleanups

2015-05-26 15:48:30 -04:00

user_spec.rb

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

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

wiki_page_spec.rb

Fix dots in Wiki slug causing errors

2015-03-21 18:33:51 -07:00