From 310e08dc2cd743952ef9a6f3bf7300448147dc77 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sun, 24 May 2015 09:00:00 -0400 Subject: [PATCH 1/2] Fix clone URL losing selection after a single click in Safari and Chrome Closes #9326 --- CHANGELOG | 1 + app/assets/javascripts/application.js.coffee | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index d1ecfb4035..45e2ee0eb7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.12.0 (unreleased) + - Fix clone URL losing selection after a single click in Safari and Chrome (Stan Hu) - Allow to configure location of the `.gitlab_shell_secret` file. (Jakub Jirutka) - Disabled expansion of top/bottom blobs for new file diffs - Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka) diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index caf18c0d86..ea2a4b9710 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -116,7 +116,10 @@ window.addEventListener "hashchange", shiftWindow $ -> # Click a .js-select-on-focus field, select the contents - $(".js-select-on-focus").on "focusin", -> $(this).select() + $(".js-select-on-focus").on "focusin", -> + # Prevent a mouseup event from deselecting the input + $(this).select().one 'mouseup', (e) -> + e.preventDefault() $('.remove-row').bind 'ajax:success', -> $(this).closest('li').fadeOut() From 8c3c5afba2e5b15cc170d51b9aab16362ab7c595 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 25 May 2015 21:41:47 -0700 Subject: [PATCH 2/2] Add file attachment support in Milestone description Closes #1648 --- CHANGELOG | 1 + app/assets/javascripts/dispatcher.js.coffee | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index ed9ffefb67..168b54edc6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.12.0 (unreleased) + - Add file attachment support in Milestone description (Stan Hu) - Add web hook support for note events (Stan Hu) - Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings (Stan Hu) - Allow to configure location of the `.gitlab_shell_secret` file. (Jakub Jirutka) diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index 2baaf430d9..da56e3cdbc 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -27,6 +27,7 @@ class Dispatcher new Milestone() when 'projects:milestones:new', 'projects:milestones:edit' new ZenMode() + new DropzoneInput($('.milestone-form')) when 'projects:compare:show' new Diff() when 'projects:issues:new','projects:issues:edit'