Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.

Resign keyboard merge #2071

Merged
rnystrom merged 3 commits into from
Aug 10, 2018
Merged

Resign keyboard merge #2071

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5dbd9f
Project icon
Huddie Jul 19, 2018
88da86f
Merge remote-tracking branch 'upstream/master'
Huddie Aug 6, 2018
f0f72c1
Fixes #2057
Huddie Aug 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Classes/Issues/Merge/IssueMergeSectionController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,9 @@ ListBindingSectionControllerSelectionDelegate {
// MARK: MergeButtonDelegate

func didSelect(button: MergeButton) {

viewController?.view.endEditing(true)

let alert = UIAlertController.configured(
title: NSLocalizedString("Confirm merge", comment: ""),
message: NSLocalizedString("Are you sure you want to merge this pull request?", comment: ""),
Expand All @@ -194,6 +197,8 @@ ListBindingSectionControllerSelectionDelegate {
func didSelectOptions(button: MergeButton) {
guard let types = self.object?.availableTypes, types.count > 0 else { return }

viewController?.view.endEditing(true)

let alert = UIAlertController.configured(
title: NSLocalizedString("Change merge type", comment: ""),
preferredStyle: .actionSheet
Expand Down