James Lopez 3e99123095 Fix merge conflicts - squashed commit ...

# Conflicts:
#	app/models/project.rb

2016-06-03 10:57:49 +02:00

..

ci

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

concerns

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

hooks

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

members

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

project_services

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

ability_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

abuse_report_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

appearance_spec.rb

Branded login page also in CE

2016-02-26 15:50:51 +01:00

application_setting_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

blob_spec.rb

Add a Blob model that wraps Gitlab::Git::Blob

2016-02-18 22:45:30 -05:00

broadcast_message_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

build_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

commit_range_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

commit_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

commit_status_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

deploy_key_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

deploy_keys_project_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

email_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

event_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

external_issue_spec.rb

Hide number sign for string prefixed external issues

2016-04-12 10:01:52 +02:00

forked_project_link_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

generic_commit_status_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

global_milestone_spec.rb

Fix Error 500 when global milestones have slashes

2015-12-22 13:15:32 -08:00

group_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

identity_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

issue_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

jira_issue_spec.rb

Backport JIRA service

2015-12-18 14:19:48 -06:00

key_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

label_link_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

label_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

legacy_diff_note_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

member_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

merge_request_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

milestone_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

namespace_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

note_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

notification_setting_spec.rb

Add spec for user_id uniq in NotificationSetting model

2016-03-30 10:44:20 +02:00

project_group_link_spec.rb

Bring ProjectGroupLink model and migrations from EE

2016-03-11 17:47:05 +01:00

project_security_spec.rb

Fix some specs

2016-03-20 22:55:08 +01:00

project_snippet_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

project_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

project_team_spec.rb

Bring shared project feature tests from EE

2016-03-12 14:45:14 +01:00

project_wiki_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

protected_branch_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

release_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

repository_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

service_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

snippet_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

spam_log_spec.rb

Refactor Admin::SpamLogsController to block user before destroying

2016-02-02 11:25:44 -02:00

todo_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

tree_spec.rb

Prioritize previewable over plain README files

2016-01-25 11:27:07 -02:00

user_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

wiki_page_spec.rb

Fix old version warning when viewing wiki latest version via version_id

2016-01-29 14:17:00 -02:00