Merge branch 'master' of github.com:gitlabhq/gitlab-ci

agend · Apr 1, 2014 · 49353f9 · 49353f9
2 parents acc70a7 + 86188d6
commit 49353f9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
@@ -21,10 +21,21 @@
 #
 #
 
-$(document).on 'click', '.edit-runner-link', ->
+$(document).on 'click', '.edit-runner-link', (event) ->
+  event.preventDefault()
+
   descr = $(this).closest('.runner-description').first()
   descr.hide()
-  descr.next('.runner-description-form').show()
+  form = descr.next('.runner-description-form')
+  descrInput = form.find('input.description')
+  originalValue = descrInput.val()
+  form.show()
+  form.find('.cancel').on 'click', (event) ->
+    event.preventDefault()
+
+    form.hide()
+    descrInput.val(originalValue)
+    descr.show()
 
 $(document).on 'click', '.assign-all-runner', ->
   $(this).replaceWith('<i class="icon-refresh icon-spin"></i> Assign in progress..')

diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml
@@ -19,6 +19,7 @@
         .form-group
           = f.text_field :description, class: 'form-control'
         = f.submit 'Save', class: 'btn'
+        %span (#{link_to 'cancel', '#', class: 'cancel'})
   %td
     - if runner.shared?
       \-

diff --git a/doc/update/4.2-to-4.3.md b/doc/update/4.2-to-4.3.md
@@ -42,7 +42,12 @@ bundle install --without mysql development test --deployment
 bundle exec rake db:migrate RAILS_ENV=production
 ```
 
-### 5. Install the new init script
+### 5. Setup unicorn
+```
+cd config/unicorn.rb.example config/unicorn.rb
+```
+
+### 6. Install the new init script
 As a user with sudo rights:
 
 ```
@@ -51,6 +56,6 @@ sudo cp lib/support/init.d/gitlab_ci /etc/init.d/gitlab_ci
 sudo chmod +x /etc/init.d/gitlab_ci
 ```
 
-### 6. Start web application
+### 7. Start web application
 
     sudo service gitlab_ci start