home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 05:06:46 +10:00
Code Issues Packages Projects Releases Wiki Activity
Files
v8.9.1
gitlabhq/app/models
T
History
Stan HuandRobert Speicher 7232392c76 Merge branch '19035-fix-merge-issue' into 'master' 
Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true

## What does this MR do?

Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true.

## Are there points in the code the reviewer needs to double check?

@stanhu I reused your proposal from the issue, I think it's a good enough solution.

## What are the relevant issue numbers?

Fixes #19035.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4912
2016-06-24 16:54:24 -04:00
..
ci
Merge branch 'fix/import-export-gitlab-errors' into 'master'
2016-06-23 14:36:40 -04:00
concerns
Merge branch 'optimize-award-emoji' into 'master'
2016-06-24 12:23:08 -04:00
hooks
Merge branch 'hook-docs-behavior' into 'master'
2016-05-11 16:34:00 +00:00
members
Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master'
2016-06-22 15:50:04 +02:00
network
Merge branch 'style/enable-semicolon-rubocop-cop' into 'master'
2016-06-01 17:41:19 +00:00
project_services
Fix broken URI joining for teamcity_url with suffixes
2016-06-14 10:07:37 +02:00
.gitkeep
init commit
2011-10-09 00:36:38 +03:00
ability.rb
Merge branch 'fix-404-for-pipelines' into 'master'
2016-06-23 14:40:54 -04:00
abuse_report.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
appearance.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
application_setting.rb
Merge branch 'feature/project-export' into 'master'
2016-06-17 14:18:15 -04:00
audit_event.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
award_emoji.rb
Fix latests concerns
2016-05-18 08:47:15 -05:00
blob.rb
Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark
2016-06-12 07:36:25 -07:00
broadcast_message.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
commit_range.rb
Don't modify arguments in CommitRange#initialize
2016-05-26 13:58:01 +02:00
commit_status.rb
Merge branch 'fix/builds-api-nil-commit' into 'master'
2016-06-21 12:08:15 -04:00
commit.rb
Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master'
2016-06-21 12:07:09 -04:00
deploy_key.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
deploy_keys_project.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
deployment.rb
Use validate and required for environment and project
2016-06-15 15:09:50 +02:00
email.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
environment.rb
Use validate and required for environment and project
2016-06-15 15:09:50 +02:00
event.rb
Reduce duplication and branching logic in EventsHelper
2016-05-16 14:52:04 -05:00
external_issue.rb
Merge branch 'master' into number_sign_for_external_issue_ref
2016-04-17 18:17:27 +02:00
forked_project_link.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
generic_commit_status.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
global_label.rb
Updates from last code review.
2016-03-06 23:07:19 -05:00
global_milestone.rb
Ruby fixes
2016-03-29 12:19:09 +01:00
group.rb
Merge branch 'group-owners-association' into 'master'
2016-06-16 13:28:06 -04:00
identity.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
issue.rb
Merge branch 'fix-out-of-bounds-markdown-refs' into 'master'
2016-06-20 10:16:00 -04:00
key.rb
Merge branch '18697-uniqueness-key-validation' into 'master'
2016-06-20 10:16:38 -04:00
label_link.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
label.rb
Fix label order by priority on labels page
2016-06-07 14:01:30 +01:00
legacy_diff_note.rb
Merge branch '18569-fix-diff-note-position' into 'master'
2016-06-23 18:20:00 -04:00
lfs_object.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
lfs_objects_project.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
member.rb
Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master'
2016-06-22 15:50:04 +02:00
merge_request_diff.rb
Merge branch 'feature/project-export' into 'master'
2016-06-17 14:18:15 -04:00
merge_request.rb
Merge branch '19035-fix-merge-issue' into 'master'
2016-06-24 16:54:24 -04:00
milestone.rb
Address Yorick's feedback
2016-05-18 23:45:25 -05:00
namespace.rb
Merge branch 'docker-registry' into docker-registry-view
2016-05-13 17:15:01 -05:00
note.rb
Merge branch 'optimize-award-emoji' into 'master'
2016-06-24 12:23:08 -04:00
notification_setting.rb
Merge branch 'issue_12758' into 'master'
2016-06-17 22:09:34 -04:00
oauth_access_token.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
personal_access_token.rb
Merge branch '2979-personal-access-tokens' into 'master'
2016-06-17 14:18:40 -04:00
personal_snippet.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
project_group_link.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
project_import_data.rb
Upgrade attr_encrypted and encryptor
2016-05-30 13:51:21 -06:00
project_snippet.rb
Refactor Participable
2016-06-01 16:22:35 +02:00
project_team.rb
UI and copywriting improvements
2016-06-14 13:18:14 +02:00
project_wiki.rb
Codestyle changes
2016-05-31 11:24:58 -03:00
project.rb
Merge branch 'feature/project-export' into 'master'
2016-06-17 14:18:15 -04:00
protected_branch.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
release.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
repository.rb
Merge branch '18709-reduce-git-calls' into 'master'
2016-06-21 12:04:34 -04:00
security_event.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
sent_notification.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
service.rb
Cache the presence of an issue_tracker at project level
2016-06-10 15:41:56 +02:00
snippet.rb
Remove projects inclusion in notes_with_associations to skip some unnecessary queries
2016-06-08 10:26:05 -04:00
spam_log.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
spam_report.rb
Support Akismet spam checking for creation of issues via API
2016-02-02 11:25:44 -02:00
subscription.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
todo.rb
Manually create todo for issuable
2016-06-14 08:36:07 +01:00
tree.rb
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs
2016-02-01 13:51:05 +01:00
u2f_registration.rb
Add a U2fRegistrations table/model.
2016-06-06 12:50:31 +05:30
user.rb
Merge branch '18709-reduce-git-calls' into 'master'
2016-06-21 12:04:34 -04:00
users_star_project.rb
Remove the annotate gem and delete old annotations
2016-05-09 18:00:28 +02:00
wiki_page.rb
add slack notifications for wiki pages
2016-04-20 08:25:40 +08:00