16 files changed, 42 insertions, 247 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee
index 17f7e180127..7c1d943667b 100644
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -100,13 +100,40 @@ class @Notes
     $('.note .js-task-list-container').taskList('disable')
     $(document).off 'tasklist:changed', '.note .js-task-list-container'
 
-  keydownNoteText: (e) ->
-    $this = $(this)
-    if $this.val() is '' and e.which is 38 and not isMetaKey e
-      myLastNote = $("li.note[data-author-id='#{gon.current_user_id}'][data-editable]:last")
-      if myLastNote.length
-        myLastNoteEditBtn = myLastNote.find('.js-note-edit')
-        myLastNoteEditBtn.trigger('click', [true, myLastNote])
+  keydownNoteText: (e) =>
+    return if isMetaKey e
+
+    $textarea = $(e.target)
+
+    # Edit previous note when UP arrow is hit
+    switch e.which
+      when 38
+        return unless $textarea.val() is ''
+
+        myLastNote = $("li.note[data-author-id='#{gon.current_user_id}'][data-editable]:last")
+        if myLastNote.length
+          myLastNoteEditBtn = myLastNote.find('.js-note-edit')
+          myLastNoteEditBtn.trigger('click', [true, myLastNote])
+
+      # Cancel creating diff note or editing any note when ESCAPE is hit
+      when 27
+        discussionNoteForm = $textarea.closest('.js-discussion-note-form')
+        if discussionNoteForm.length
+          if $textarea.val() isnt ''
+            return unless confirm('Are you sure you want to cancel creating this comment?')
+
+          @removeDiscussionNoteForm(discussionNoteForm)
+          return
+
+        editNote = $textarea.closest('.note')
+        if editNote.length
+          originalText = $textarea.closest('form').data('original-note')
+          newText = $textarea.val()
+          if originalText isnt newText
+            return unless confirm('Are you sure you want to cancel editing this comment?')
+
+          @removeNoteEditForm(editNote)
+
 
   isMetaKey = (e) ->
     (e.metaKey or e.ctrlKey or e.altKey or e.shiftKey)
@@ -401,9 +428,12 @@ class @Notes
 
   Hides edit form and restores the original note text to the editor textarea.
   ###
-  cancelEdit: (e) ->
+  cancelEdit: (e) =>
     e.preventDefault()
-    note = $(this).closest(".note")
+    note = $(e.target).closest('.note')
+    @removeNoteEditForm(note)
+
+  removeNoteEditForm: (note) ->
     form = note.find(".current-note-edit-form")
     note.removeClass "is-editting"
     form.removeClass("current-note-edit-form")
diff --git a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
index b8c06c383fb..fca40f68b01 100644
--- a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
+++ b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb
@@ -19,12 +19,12 @@ feature 'User wants to add a .gitlab-ci.yml file', feature: true do
     find('.js-gitlab-ci-yml-selector').click
     wait_for_ajax
     within '.gitlab-ci-yml-selector' do
-      find('.dropdown-input-field').set('jekyll')
-      find('.dropdown-content li', text: 'jekyll').click
+      find('.dropdown-input-field').set('Jekyll')
+      find('.dropdown-content li', text: 'Jekyll').click
     end
     wait_for_ajax
 
-    expect(page).to have_css('.gitlab-ci-yml-selector .dropdown-toggle-text', text: 'jekyll')
+    expect(page).to have_css('.gitlab-ci-yml-selector .dropdown-toggle-text', text: 'Jekyll')
     expect(page).to have_content('This file is a template, and might need editing before it works on your project')
     expect(page).to have_content('jekyll build -d test')
   end
diff --git a/vendor/gitlab-ci-yml/Pages/brunch.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/brunch.gitlab-ci.yml
deleted file mode 100644
index 7fcc0b436b5..00000000000
--- a/vendor/gitlab-ci-yml/Pages/brunch.gitlab-ci.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Full project: https://gitlab.com/pages/brunch
-image: node:4.2.2
-
-pages:
-  cache:
-    paths:
-    - node_modules/
-
-  script:
-  - npm install -g brunch
-  - brunch build --production
-  artifacts:
-    paths:
-    - public
-  only:
-  - master
diff --git a/vendor/gitlab-ci-yml/Pages/doxygen.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/doxygen.gitlab-ci.yml
deleted file mode 100644
index 791afdd23f1..00000000000
--- a/vendor/gitlab-ci-yml/Pages/doxygen.gitlab-ci.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Full project: https://gitlab.com/pages/doxygen
-image: alpine
-
-pages:
-  script:
-  - apk update && apk add doxygen
-  - doxygen doxygen/Doxyfile
-  - mv doxygen/documentation/html/ public/
-  artifacts:
-    paths:
-    - public
-  only:
-  - master
diff --git a/vendor/gitlab-ci-yml/Pages/harp.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/harp.gitlab-ci.yml
deleted file mode 100644
index dd3ef149668..00000000000
--- a/vendor/gitlab-ci-yml/Pages/harp.gitlab-ci.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Full project: https://gitlab.com/pages/harp
-image: node:4.2.2
-
-pages:
-  cache:
-    paths:
-    - node_modules
-
-  script:
-  - npm install -g harp
-  - harp compile ./ public
-  artifacts:
-    paths:
-    - public
-  only:
-  - master
diff --git a/vendor/gitlab-ci-yml/Pages/hexo.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/hexo.gitlab-ci.yml
deleted file mode 100644
index b468d79bcad..00000000000
--- a/vendor/gitlab-ci-yml/Pages/hexo.gitlab-ci.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Full project: https://gitlab.com/pages/hexo
-image: python:2.7
-
-cache:
-  paths:
-  - vendor/
-
-test:
-  stage: test
-  script:
-    - pip install hyde
-    - hyde gen
-  except:
-    - master
-
-pages:
-  stage: deploy
-  script:
-    - pip install hyde
-    - hyde gen -d public
-  artifacts:
-    paths:
-    - public
-  only:
-    - master
diff --git a/vendor/gitlab-ci-yml/Pages/html.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/html.gitlab-ci.yml
deleted file mode 100644
index 249a168aa33..00000000000
--- a/vendor/gitlab-ci-yml/Pages/html.gitlab-ci.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Full project: https://gitlab.com/pages/plain-html
-pages:
-  stage: deploy
-  script:
-  - mkdir .public
-  - cp -r * .public
-  - mv .public public
-  artifacts:
-    paths:
-    - public
-  only:
-  - master
diff --git a/vendor/gitlab-ci-yml/Pages/hugo.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/hugo.gitlab-ci.yml
deleted file mode 100644
index 45df6975259..00000000000
--- a/vendor/gitlab-ci-yml/Pages/hugo.gitlab-ci.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Full project: https://gitlab.com/pages/hugo
-image: publysher/hugo
-
-pages:
-  script:
-  - hugo
-  artifacts:
-    paths:
-    - public
-  only:
-  - master
diff --git a/vendor/gitlab-ci-yml/Pages/hyde.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/hyde.gitlab-ci.yml
deleted file mode 100644
index f5b40f2b9f1..00000000000
--- a/vendor/gitlab-ci-yml/Pages/hyde.gitlab-ci.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Full project: https://gitlab.com/pages/hyde
-image: python:2.7
-
-cache:
-  paths:
-  - vendor/
-
-test:
-  stage: test
-  script:
-    - pip install hyde
-    - hyde gen
-  except:
-    - master
-
-pages:
-  stage: deploy
-  script:
-    - pip install hyde
-    - hyde gen -d public
-  artifacts:
-    paths:
-    - public
-  only:
-    - master
diff --git a/vendor/gitlab-ci-yml/Pages/jekyll.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/jekyll.gitlab-ci.yml
deleted file mode 100644
index 36918fc005a..00000000000
--- a/vendor/gitlab-ci-yml/Pages/jekyll.gitlab-ci.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Full project: https://gitlab.com/pages/jekyll
-image: ruby:2.3
-
-test:
-  stage: test
-  script:
-  - gem install jekyll
-  - jekyll build -d test
-  artifacts:
-    paths:
-    - test
-  except:
-  - master
-
-pages:
-  stage: deploy
-  script:
-  - gem install jekyll
-  - jekyll build -d public
-  artifacts:
-    paths:
-    - public
-  only:
-  - master
diff --git a/vendor/gitlab-ci-yml/Pages/lektor.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/lektor.gitlab-ci.yml
deleted file mode 100644
index c5c44a5d86c..00000000000
--- a/vendor/gitlab-ci-yml/Pages/lektor.gitlab-ci.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Full project: https://gitlab.com/pages/hyde
-image: python:2.7
-
-pages:
-  script:
-  - pip install lektor
-  - lektor build --output-path public
-  artifacts:
-    paths:
-    - public
-  only:
-  - master
diff --git a/vendor/gitlab-ci-yml/Pages/metalsmith.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/metalsmith.gitlab-ci.yml
deleted file mode 100644
index 50e8b7ccd46..00000000000
--- a/vendor/gitlab-ci-yml/Pages/metalsmith.gitlab-ci.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Full project: https://gitlab.com/pages/metalsmith
-image: node:4.2.2
-
-pages:
-  cache:
-    paths:
-    - node_modules/
-
-  script:
-  - npm install -g metalsmith
-  - npm install
-  - make build
-  artifacts:
-    paths:
-    - public
-  only:
-  - master
diff --git a/vendor/gitlab-ci-yml/Pages/middleman.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/middleman.gitlab-ci.yml
deleted file mode 100644
index 9f4cc0574d6..00000000000
--- a/vendor/gitlab-ci-yml/Pages/middleman.gitlab-ci.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Full project: https://gitlab.com/pages/middleman
-image: ruby:2.3
-
-cache:
-  paths:
-  - vendor
-
-test:
-  script:
-  - apt-get update -yqqq
-  - apt-get install -y nodejs
-  - bundle install --path vendor
-  - bundle exec middleman build
-  except:
-    - master
-
-pages:
-  script:
-  - apt-get update -yqqq
-  - apt-get install -y nodejs
-  - bundle install --path vendor
-  - bundle exec middleman build
-  artifacts:
-    paths:
-    - public
-  only:
-  - master
diff --git a/vendor/gitlab-ci-yml/Pages/nanoc.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/nanoc.gitlab-ci.yml
deleted file mode 100644
index b469b316ba5..00000000000
--- a/vendor/gitlab-ci-yml/Pages/nanoc.gitlab-ci.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Full project: https://gitlab.com/pages/nanoc
-image: ruby:2.3
-
-pages:
-  script:
-  - bundle install -j4
-  - nanoc
-  artifacts:
-    paths:
-    - public
-  only:
-  - master
diff --git a/vendor/gitlab-ci-yml/Pages/octopress.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/octopress.gitlab-ci.yml
deleted file mode 100644
index 4762ec9acfd..00000000000
--- a/vendor/gitlab-ci-yml/Pages/octopress.gitlab-ci.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Full project: https://gitlab.com/pages/octopress
-image: ruby:2.3
-
-pages:
-  script:
-  - apt-get update -qq && apt-get install -qq nodejs
-  - bundle install -j4
-  - bundle exec rake generate
-  - mv public .public
-  - mv .public/octopress public
-  artifacts:
-    paths:
-    - public
-  only:
-  - master
diff --git a/vendor/gitlab-ci-yml/Pages/pelican.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/pelican.gitlab-ci.yml
deleted file mode 100644
index c5f3154f587..00000000000
--- a/vendor/gitlab-ci-yml/Pages/pelican.gitlab-ci.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# Full project: https://gitlab.com/pages/pelican
-image: python:2.7-alpine
-
-pages:
-  script:
-  - pip install -r requirements.txt
-  - pelican -s publishconf.py
-  artifacts:
-    paths:
-    - public/