gitlab-org--gitlab-foss/spec/models
Mark Chao 5b994b8199 Notify only when unmergeable due to conflict
There is still the edge case when 'no commits' changes to 'conflict'
would not trigger notification, which we ignore for now.

Calling can_be_merged? can cause exception (e.g. non-UTF8)
Ignore those by rescueing.

Remove unmergeable_reason as now only conflict is notified

Update spec
2018-06-20 23:27:17 +08:00
..
application_setting Messaging on terms page when user already accepted 2018-06-04 22:22:11 +02:00
badges
blob_viewer Bump Gitaly to 0.98.0 2018-05-07 14:10:04 +02:00
ci Remove unexpected data store test suite 2018-06-15 18:20:46 +09:00
clusters Resolve "Unable to install Prometheus on Clusters: 'Error: Chart incompatible with Tiller v2.7.0'" 2018-06-20 12:10:14 +00:00
concerns enable CommonMark as the default 2018-06-14 08:30:16 +00:00
conversational_development_index
cycle_analytics
diff_viewer
hooks
issue
members Ensure member notifications are sent after the member actual creation/update in the DB 2018-04-26 08:28:05 +02:00
merge_request
network
project_services Remove FaviconUploader favicon_main version 2018-06-15 12:28:23 +02:00
protected_branch
ability_spec.rb Remove edit_note and update_note abilities in favor of admin_note 2018-04-10 15:46:20 +02:00
abuse_report_spec.rb
active_session_spec.rb Display and revoke active sessions 2018-05-02 08:08:16 +00:00
appearance_spec.rb Use the new CacheableAttributes concern in the ApplicationSetting and Appearance models 2018-05-23 16:14:43 +02:00
application_setting_spec.rb Fix repository_storage spec for Rails5 2018-06-04 18:05:20 +02:00
award_emoji_spec.rb
badge_spec.rb
blob_spec.rb
board_spec.rb
broadcast_message_spec.rb Backport: Propagate broadcast messages to secondaries 2018-04-11 11:28:44 -07:00
chat_name_spec.rb
chat_team_spec.rb
commit_collection_spec.rb
commit_range_spec.rb
commit_spec.rb Preload pipeline data for project pipelines 2018-05-17 13:53:00 +02:00
commit_status_spec.rb Respect the inheritance chain between Ci::Build and CommitStatus 2018-05-16 15:59:51 -05:00
compare_spec.rb
container_repository_spec.rb
cycle_analytics_spec.rb
deploy_key_spec.rb Fall back on ghost user when deploy key user is not set 2018-03-28 18:54:15 +02:00
deploy_keys_project_spec.rb
deploy_token_spec.rb Refactor deploy token methods on Ci::Build 2018-04-20 12:18:41 -05:00
deployment_spec.rb Clarify scope for AtomicInternalId shared spec 2018-05-14 17:41:56 +09:00
diff_discussion_spec.rb
diff_note_spec.rb Persist truncated note diffs on a new table 2018-05-24 15:34:43 -03:00
discussion_spec.rb
email_spec.rb
environment_spec.rb Allow admins to push to empty repos 2018-04-24 14:06:59 +02:00
event_collection_spec.rb
event_spec.rb Throttle updates to Project#last_repository_updated_at. 2018-05-29 12:51:32 +02:00
external_issue_spec.rb
fork_network_member_spec.rb
fork_network_spec.rb
forked_project_link_spec.rb
generic_commit_status_spec.rb Respect the inheritance chain between Ci::Build and CommitStatus 2018-05-16 15:59:51 -05:00
global_milestone_spec.rb
gpg_key_spec.rb
gpg_key_subkey_spec.rb
gpg_signature_spec.rb
group_custom_attribute_spec.rb
group_label_spec.rb
group_milestone_spec.rb
group_spec.rb Merge branch 'issue_44230' into 'master' 2018-06-07 20:10:45 +00:00
guest_spec.rb Add a unique and not null constraint on the project_features.project_id column 2018-05-15 14:20:14 +02:00
identity_spec.rb
instance_configuration_spec.rb
internal_id_spec.rb Remove double-checked internal id generation. 2018-05-28 12:46:03 +02:00
issue_collection_spec.rb
issue_spec.rb Clarify scope for AtomicInternalId shared spec 2018-05-14 17:41:56 +09:00
key_spec.rb
label_link_spec.rb
label_priority_spec.rb
label_spec.rb
legacy_diff_discussion_spec.rb
lfs_file_lock_spec.rb
lfs_object_spec.rb Fix file_store for artifacts and lfs when saving 2018-05-01 22:27:54 +02:00
lfs_objects_project_spec.rb
list_spec.rb
member_spec.rb
merge_request_diff_commit_spec.rb [Rails5] Update type_cast_*_database methods 2018-04-06 10:57:19 +00:00
merge_request_diff_file_spec.rb
merge_request_diff_spec.rb
merge_request_spec.rb Notify only when unmergeable due to conflict 2018-06-20 23:27:17 +08:00
milestone_spec.rb Clarify scope for AtomicInternalId shared spec 2018-05-14 17:41:56 +09:00
namespace_spec.rb Find and mark more Git disk access locations 2018-06-05 15:51:14 +00:00
note_diff_file_spec.rb Persist truncated note diffs on a new table 2018-05-24 15:34:43 -03:00
note_spec.rb Fix N+1 queries when loading participants for a commit note 2018-04-18 22:04:22 -07:00
notification_recipient_spec.rb Apply notification settings level of groups to all child objects 2018-06-07 15:47:39 -03:00
notification_setting_spec.rb [Rails5] Fix spec/models/notification_setting_spec.rb 2018-05-01 18:30:37 +11:00
pages_domain_spec.rb Add HTTPS-only pages 2018-03-22 19:58:36 +01:00
personal_access_token_spec.rb
project_authorization_spec.rb
project_auto_devops_spec.rb Merge remote-tracking branch 'origin/master' into 38542-application-control-panel-in-settings-page 2018-06-07 20:27:30 +02:00
project_ci_cd_setting_spec.rb Introduce new ProjectCiCdSetting 2018-04-16 14:05:35 +02:00
project_custom_attribute_spec.rb
project_deploy_token_spec.rb Addresses database comments 2018-04-06 21:20:17 -05:00
project_feature_spec.rb
project_group_link_spec.rb
project_import_state_spec.rb Backports every CE related change from ee-44542 to CE 2018-05-04 17:33:26 +02:00
project_label_spec.rb
project_snippet_spec.rb
project_spec.rb Eliminate N+1 queries in LFS file locks checks during a push 2018-06-18 16:42:20 -07:00
project_statistics_spec.rb Update ProjectStatistics#build_artifacts_size synchronously without summing (#41059) 2018-04-19 18:35:40 +10:00
project_team_spec.rb Fix spec 2018-06-06 20:57:15 +09:00
project_wiki_spec.rb Deny repository disk access in development and test 2018-06-14 11:18:25 +00:00
protectable_dropdown_spec.rb
protected_branch_spec.rb
protected_tag_spec.rb
push_event_payload_spec.rb
push_event_spec.rb
redirect_route_spec.rb
release_spec.rb
remote_mirror_spec.rb Deny repository disk access in development and test 2018-06-14 11:18:25 +00:00
repository_spec.rb Move mergablility check to Gitaly 2018-06-20 09:11:55 +02:00
route_spec.rb Remove permanent redirects 2018-03-28 14:12:08 +02:00
sent_notification_spec.rb
service_spec.rb Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'security-10-6' 2018-04-05 08:41:56 +02:00
snippet_blob_spec.rb
snippet_spec.rb
spam_log_spec.rb
subscription_spec.rb
system_note_metadata_spec.rb
term_agreement_spec.rb Messaging on terms page when user already accepted 2018-06-04 22:22:11 +02:00
timelog_spec.rb Resolve "Update updated_at on an issue/mr on every issue/mr changes" 2018-06-01 15:09:08 +00:00
todo_spec.rb
tree_spec.rb
trending_project_spec.rb
upload_spec.rb
user_agent_detail_spec.rb
user_callout_spec.rb
user_custom_attribute_spec.rb
user_interacted_project_spec.rb
user_spec.rb send ico files with inline disposition 2018-06-05 16:20:20 +02:00
wiki_directory_spec.rb
wiki_page_spec.rb Bump Gitaly to 0.98.0 2018-05-07 14:10:04 +02:00