Robert Speicher b93744e300 Merge branch 'merge-when-build-succeeds-unchecked' into 'master' ... Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running The Merge when build succeeds service only merges when the MR is mergeable (open, not WIP, no conflicts). When the target branch is updated, all affected MRs have their merge status set to `unchecked`, and the conflicts check will only happen when `check_if_can_be_merged` is called, which happens when the MR page is viewed. When someone enables the automatic merge, the target branch is updated, no-one views the MR page again, and the build succeeds, the mergeability check will fail and the MR will not in fact be merged. This MR makes sure `check_if_can_be_merged` is always called when MR mergeability is checked. See merge request !2304		2016-01-06 18:58:10 +00:00
..
ci	Fix project destroy callback	2016-01-05 20:49:31 +01:00
concerns	Fix mentionable reference extraction caching.	2016-01-06 13:33:11 +01:00
hooks	Migrate CI::Services and CI::WebHooks to Services and WebHooks	2015-12-10 16:04:08 +01:00
members
network
project_services	Don't log backtrace in Asana service	2016-01-04 11:19:39 -04:00
.gitkeep
ability.rb	remove public field from namespace and refactoring	2016-01-04 16:00:29 +02:00
abuse_report.rb	Add AbuseReport#notify	2016-01-04 18:59:42 -05:00
application_setting.rb	reCAPTCHA is configurable through Admin Settings, no reload needed.	2015-12-28 18:50:29 -02:00
audit_event.rb	Re-annotate models	2015-08-03 01:52:54 +09:00
broadcast_message.rb	Add custom ColorValidator	2015-12-07 16:57:26 -05:00
commit.rb	Merge branch 'master' into tmp-reference-pipeline-and-caching	2015-12-10 14:04:34 +01:00
commit_range.rb	Satisfy Rubocop	2015-12-02 10:54:24 +01:00
commit_status.rb	Fix errors	2015-12-11 18:02:09 +01:00
deploy_key.rb
deploy_keys_project.rb
diff_line.rb
email.rb
event.rb	Don't show project fork event as imported	2015-12-02 10:56:05 +01:00
external_issue.rb
forked_project_link.rb
generic_commit_status.rb	Annotate models	2015-11-13 19:22:46 +01:00
global_label.rb	Refactor global and group milestones logic	2015-11-16 14:07:38 +01:00
global_milestone.rb	Fix Error 500 when global milestones have slashes	2015-12-22 13:15:32 -08:00
group.rb	remove public field from namespace and refactoring	2016-01-04 16:00:29 +02:00
identity.rb	Fix identity and user retrieval when special characters are used	2015-12-22 13:23:35 -05:00
issue.rb	Fix issue related cross-project MRs	2015-12-21 15:36:08 +01:00
jira_issue.rb	Backport JIRA service	2015-12-18 14:19:48 -06:00
key.rb	Only publish ssh key-type and key	2015-08-04 14:33:18 +02:00
label.rb	Add custom ColorValidator	2015-12-07 16:57:26 -05:00
label_link.rb
lfs_object.rb	Update annotations	2015-12-08 21:00:01 -08:00
lfs_objects_project.rb	Update annotations	2015-12-08 21:00:01 -08:00
member.rb	Refactor ability changes	2015-11-17 15:49:37 +01:00
merge_request.rb	Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running	2016-01-05 16:30:03 +01:00
merge_request_diff.rb	Add ignore white space option in merge request diff	2015-11-13 16:53:53 +09:00
milestone.rb	Use "Any Label" and "Any Milestone" in selects rather than the ambiguous "Any" option	2015-12-02 14:10:43 +01:00
namespace.rb	Fixed Rubocop offenses	2015-12-15 00:53:52 -02:00
note.rb	note votes methids implementation	2015-12-29 10:11:20 +02:00
notification.rb	Added Global to the drop downs and updated the label of the button to show the current level instead of Notifications	2015-09-16 19:46:24 -05:00
personal_snippet.rb
project.rb	Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master'	2016-01-05 15:44:22 +00:00
project_import_data.rb
project_snippet.rb
project_team.rb	Improve ProjectTeam#max_member_access performance	2015-10-15 12:05:01 +02:00
project_wiki.rb	Make ProjectWiki touch Project#last_activity_at after wiki actions	2015-11-16 13:08:25 -05:00
protected_branch.rb
release.rb	Annotate models	2015-11-13 19:22:46 +01:00
repository.rb	Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master'	2016-01-05 15:44:22 +00:00
security_event.rb	Re-annotate models	2015-08-03 01:52:54 +09:00
sent_notification.rb	Add custom LineCodeValidator	2015-12-07 16:57:26 -05:00
service.rb	Migrate CI::Project to Project	2015-12-11 18:02:09 +01:00
snippet.rb	Autolink first so we don't pick up numeric anchors as issue references.	2015-12-01 15:53:32 +01:00
subscription.rb
tree.rb	Validate README format before displaying	2016-01-05 11:06:18 -02:00
user.rb	Prevent duplicate "username has already been taken" validation message	2016-01-02 20:03:28 -05:00
users_star_project.rb	Touch project when toggling stars to update cache	2015-12-03 16:08:08 -02:00
wiki_page.rb