kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/models
History
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 Projects and groups badges API 2018-03-05 17:51:40 +00:00
blob_viewer BlobViewer::PackageJson - if private link to homepage 2017-12-18 23:18:23 -06:00
ci Merge branch 'expose-ci-url' into 'master' 2018-06-12 12:17:50 +00: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 Fix redis_cacheable deserialization 2018-06-19 09:27:09 -06:00
conversational_development_index
diff_viewer
hooks Add validation to webhook and service URLs to ensure they are not blocked because of SSRF 2018-06-01 11:43:53 +00:00
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 Cache merged and closed events data in merge_request_metrics table 2018-01-02 17:45:25 -02:00
network Fix Gitaly n+1 in NetworkController#show 2018-03-06 13:32:48 +00:00
project_services Merge branch '45487-slack-tag-push-notifs' into 'master' 2018-06-19 12:07:05 +00:00
protected_branch
protected_tag Deduplicate protected ref human_access_levels 2017-11-24 13:47:03 +00:00
storage Gitlab::Shell works on shard name, not path 2018-04-25 13:36:22 +02:00
.gitkeep
ability.rb Backport of 4084-epics-username-autocomplete 2018-05-04 11:33:09 -06:00
abuse_report.rb
active_session.rb Display and revoke active sessions 2018-05-02 08:08:16 +00:00
appearance.rb allow uploading favicon in appearance settings 2018-06-05 16:20:18 +02:00
application_setting.rb Removed API endpoint and specs 2018-05-30 18:23:07 +02:00
audit_event.rb
award_emoji.rb
badge.rb Add validation to webhook and service URLs to ensure they are not blocked because of SSRF 2018-06-01 11:43:53 +00:00
blob.rb 26039 - update github-linguist to 5.3.3 version 2018-02-21 03:29:04 +10:30
board.rb Bring one group board to CE 2018-03-03 12:56:17 -03:00
broadcast_message.rb Backport: Propagate broadcast messages to secondaries 2018-04-11 11:28:44 -07:00
chat_name.rb Expose ChatName objects to slash commands 2018-02-23 14:37:53 +01:00
chat_team.rb
commit.rb Preload pipeline data for project pipelines 2018-05-17 13:53:00 +02:00
commit_collection.rb Optimise getting the pipeline status of commits 2017-11-16 16:01:14 +01:00
commit_range.rb Fix link text from group context 2017-11-23 12:59:14 +01:00
commit_status.rb Enable mapping to nil in enums 2018-06-06 20:46:54 +02:00
compare.rb Remove unused Compare#base_commit 2018-03-08 11:39:50 -03:00
container_repository.rb
cycle_analytics.rb Refactors median code to work with both single and multiple projects 2018-02-28 10:46:20 +00:00
dashboard_milestone.rb
deploy_key.rb Revert the addition of goldiloader 2018-04-18 15:51:39 +02:00
deploy_keys_project.rb Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3' 2018-01-16 17:04:51 -08:00
deploy_token.rb Refactor deploy token methods on Ci::Build 2018-04-20 12:18:41 -05:00
deployment.rb Fix static analysys 2018-05-11 16:52:48 +09:00
diff_discussion.rb Fix links to old commits in merge requests 2017-12-29 14:44:39 +01:00
diff_note.rb Persist truncated note diffs on a new table 2018-05-24 15:34:43 -03:00
directly_addressed_user.rb
discussion.rb Allow commenting on individual commits inside an MR 2017-12-07 09:01:19 -05:00
discussion_note.rb
email.rb Use fuzzy search with minimum length of 3 characters where appropriate 2017-11-27 11:29:40 +01:00
environment.rb Add validation to webhook and service URLs to ensure they are not blocked because of SSRF 2018-06-01 11:43:53 +00:00
epic.rb Refactor banzai to support referencing from group context 2017-12-06 19:16:22 +01:00
event.rb Throttle updates to Project#last_repository_updated_at. 2018-05-29 12:51:32 +02:00
event_collection.rb
external_issue.rb Fix closing issues text added to MRs for external issue trackers 2018-02-14 14:58:28 +00:00
fork_network.rb Revert the addition of goldiloader 2018-04-18 15:51:39 +02:00
fork_network_member.rb Delete the fork network when removing the last membership 2017-11-17 12:58:15 +01:00
forked_project_link.rb
generic_commit_status.rb Add validation to webhook and service URLs to ensure they are not blocked because of SSRF 2018-06-01 11:43:53 +00:00
global_label.rb
global_milestone.rb Merge branch 'milestones-finder-order-fix' into 'security-10-3' 2018-01-16 17:04:38 -08:00
gpg_key.rb
gpg_key_subkey.rb
gpg_signature.rb Fix error with GPG signature updater when commit was deleted 2017-10-07 10:47:53 -05:00
group.rb Merge branch 'issue_44230' into 'master' 2018-06-07 20:10:45 +00:00
group_custom_attribute.rb Support custom attributes on groups 2017-11-06 10:51:50 +01:00
group_label.rb
group_milestone.rb
guest.rb
identity.rb Backport Identity.uniqueness_scope from EE 2018-05-02 14:36:47 +01:00
individual_note_discussion.rb
instance_configuration.rb Added ssh fingerprint, gitlab ci and pages information in an instance configuration page 2017-10-25 23:51:26 +03:00
internal_id.rb Merge branch 'master' into per-project-pipeline-iid 2018-05-30 14:50:09 +09:00
issue.rb Merge branch 'master' into per-project-pipeline-iid 2018-06-01 14:32:40 +09:00
issue_assignee.rb use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
issue_collection.rb
key.rb Revert "Merge branch 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master'" 2018-02-15 09:50:19 -05:00
label.rb Merge remote-tracking branch 'origin/master' into 39549-label-list-page-redesign-with-draggable-labels 2018-05-28 12:27:06 +01:00
label_link.rb
label_priority.rb
legacy_diff_discussion.rb
legacy_diff_note.rb Improve performance of DiffDiscussion#truncated_diff_lines and DiffNote#diff_line by removing expensive diff position calculation and comparison 2017-12-22 18:07:15 +01:00
lfs_file_lock.rb Backport of LFS File Locking API 2018-02-07 09:04:00 -05:00
lfs_object.rb Fix file_store for artifacts and lfs when saving 2018-05-01 22:27:54 +02:00
lfs_objects_project.rb
list.rb Backport of "Add assignee lists to boards" 2018-06-07 20:54:24 +00:00
member.rb Add 2FA filter to group members page 2018-05-10 13:02:56 +03:00
merge_request.rb Notify only when unmergeable due to conflict 2018-06-20 23:27:17 +08:00
merge_request_diff.rb Cleanup after adding MR diff's commit_count (try 2) 2018-04-25 10:53:37 +02:00
merge_request_diff_commit.rb [Rails5] Update type_cast_*_database methods 2018-04-06 10:57:19 +00:00
merge_request_diff_file.rb Persist truncated note diffs on a new table 2018-05-24 15:34:43 -03:00
merge_requests_closing_issues.rb
milestone.rb Fix static analysys 2018-05-11 16:52:48 +09:00
namespace.rb Add Ci::Runner inverse_of's 2018-05-31 10:56:41 +02:00
note.rb Fix an N+1 in avatar URLs 2018-06-05 14:57:19 +01:00
note_diff_file.rb Persist truncated note diffs on a new table 2018-05-24 15:34:43 -03:00
notification_reason.rb Initial work to add notification reason to emails 2018-01-16 19:17:55 -06:00
notification_recipient.rb Merge branch 'issue_44230' into 'master' 2018-06-07 20:10:45 +00:00
notification_setting.rb Only send issue due emails to participants and custom subscribers 2018-03-30 13:25:46 +01:00
oauth_access_grant.rb
oauth_access_token.rb Update specs for sudo behavior 2017-11-02 11:39:03 +01:00
out_of_context_discussion.rb
pages_domain.rb Upgrade to Ruby 2.4.4 2018-05-29 15:19:33 -07:00
personal_access_token.rb Fix new personal access token showing up in a flash message 2017-12-07 16:22:37 -06:00
personal_snippet.rb Fix an N+1 in avatar URLs 2018-06-05 14:57:19 +01:00
project.rb Eliminate N+1 queries in LFS file locks checks during a push 2018-06-18 16:42:20 -07:00
project_authorization.rb
project_auto_devops.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.rb Fix Project#group_runners_enabled as it was doing nothing 2018-05-03 14:37:19 +02:00
project_custom_attribute.rb Support custom attributes on projects 2017-11-06 10:51:46 +01:00
project_deploy_token.rb Increase test suite around deploy tokens behavior 2018-04-06 21:20:17 -05:00
project_feature.rb
project_group_link.rb
project_import_data.rb Upgrade to Ruby 2.4.4 2018-05-29 15:19:33 -07:00
project_import_state.rb Backports every CE related change from ee-44542 to CE 2018-05-04 17:33:26 +02:00
project_label.rb
project_snippet.rb
project_statistics.rb Update ProjectStatistics#build_artifacts_size synchronously without summing (#41059) 2018-04-19 18:35:40 +10:00
project_team.rb Backport relevant changes from EE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4827 to CE 2018-03-07 17:01:32 +00:00
project_wiki.rb Add ability to search wiki titles 2018-06-04 11:41:37 +00:00
protectable_dropdown.rb
protected_branch.rb Rename master to maintainer 2018-06-06 20:57:14 +09:00
protected_ref_matcher.rb
protected_tag.rb Only load branch names for protected branch checks 2017-11-29 16:54:54 +01:00
push_event.rb Last push widget will show banner for new pushes to previously merged branch 2018-01-15 16:45:56 -06:00
push_event_payload.rb
readme_blob.rb
redirect_route.rb Remove permanent redirects 2018-03-28 14:12:08 +02:00
release.rb
remote_mirror.rb Avoid checking the user format in every url validation 2018-06-11 13:29:37 +00:00
repository.rb Merge branch 'zj-can-be-merged' into 'master' 2018-06-20 14:15:28 +00:00
route.rb Remove permanent redirects 2018-03-28 14:12:08 +02:00
security_event.rb
sent_notification.rb Backport 5480-epic-notifications from EE 2018-05-07 12:58:47 -06:00
service.rb Fix boolean casting for nil value 2018-05-29 14:46:42 +02:00
snippet.rb Add discussion API 2018-03-07 12:27:50 +01:00
snippet_blob.rb
spam_log.rb
subscription.rb
system_note_metadata.rb Backport of 1481-changing-weight-values-should-trigger-system-notes 2018-05-03 11:18:51 -07:00
term_agreement.rb Messaging on terms page when user already accepted 2018-06-04 22:22:11 +02:00
timelog.rb Rails5 fix expected issuable.reload.updated_at to have changed 2018-06-13 07:52:35 +02:00
todo.rb Revert the addition of goldiloader 2018-04-18 15:51:39 +02:00
tree.rb Migrate recursive tree entries fetching to Gitaly 2018-02-26 16:59:29 +01:00
trending_project.rb
u2f_registration.rb
upload.rb remove EE-only code 2018-03-22 13:00:58 -04:00
user.rb Fix some N+1s when calculating notification recipients 2018-06-07 12:37:57 +01:00
user_agent_detail.rb
user_callout.rb Resolve "Inform users of up to $500 offer for GCP account" 2018-05-07 18:06:02 +00:00
user_custom_attribute.rb
user_interacted_project.rb Shortcut and return on duplicate record error. 2018-03-06 12:53:15 +01:00
user_synced_attributes_metadata.rb Moved o_auth/saml/ldap modules under gitlab/auth 2018-02-28 16:53:02 +01:00
users_star_project.rb
wiki_directory.rb
wiki_page.rb Fix Custom hooks are not triggered by UI wiki edit 2018-04-18 17:50:56 +00:00