diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-07-30 09:48:24 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-07-30 09:48:24 +0000 |
| commit | 42f9bb0e23f7a98e4d2928916783a83fd5965e7b (patch) | |
| tree | 103788352eaf26a3db11667083b48fa0165bd43f | |
| parent | f1db513a69503e652ab26cc4f985d9c6588c65cb (diff) | |
| parent | d4030094c911c2eba1325cafbbe3eeb4bc7f8e17 (diff) | |
| download | gitlab-ci-42f9bb0e23f7a98e4d2928916783a83fd5965e7b.tar.gz | |
Merge branch 'fix_inline_edit_runner_description' into 'master'
Fix inline edit runner-description
Fixes: #217
Replaced .show and .hide with .removeClass('hide') and .addClass('hide') (Like done for #192 in MR 177)
See merge request !206
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 8 |
2 files changed, 7 insertions, 6 deletions
@@ -7,6 +7,7 @@ v7.13.1 - Fix invalid link to doc.gitlab.com v7.13.0 + - Fix inline edit runner-description - Allow to specify image and services in yml that can be used with docker - Fix: No runner notification can see managers only - Ability to cancel all builds in commit at once @@ -48,7 +49,7 @@ v7.12.0 - Using .gitlab-ci.yml file instead of jobs - Link to the runner from the build page for admin user - Ability to set secret variables for runner - - Dont retry build when push same commit in same ref twice + - Dont retry build when push same commit in same ref twice - Admin area: show amount of runners with last contact less than a minute ago - Fix re-adding project with the same name but different gitlab_id - Implementation of Lint (.gitlab-ci.yml validation tool) @@ -92,7 +93,7 @@ v7.10.0 - Runners sorting in admin area (by id) - Remove protected_attributes gem - Skip commit creation if there is no appropriate job - + v7.9.3 - Contains no changes - Developers can cancel and retry jobs diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 8645c78..933ede6 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -28,17 +28,17 @@ $(document).on 'click', '.edit-runner-link', (event) -> event.preventDefault() descr = $(this).closest('.runner-description').first() - descr.hide() + descr.addClass('hide') form = descr.next('.runner-description-form') descrInput = form.find('input.description') originalValue = descrInput.val() - form.show() + form.removeClass('hide') form.find('.cancel').on 'click', (event) -> event.preventDefault() - form.hide() + form.addClass('hide') descrInput.val(originalValue) - descr.show() + descr.removeClass('hide') $(document).on 'click', '.assign-all-runner', -> $(this).replaceWith('<i class="icon-refresh icon-spin"></i> Assign in progress..') |