Merge branch 'master' of github.com:gitlabhq/gitlabhq

.gitignore

@@ -38,3 +38,4 @@ public/uploads.*
 public/assets/
 .envrc
 dump.rdb
+tags

CONTRIBUTING.md

@@ -44,7 +44,7 @@ Please send a merge request with a tested solution or a merge request with a fai
 1. **Output of checks**
     * Results of GitLab [Application Check](doc/install/installation.md#check-application-status) (`sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production SANITIZE=true`); we will only investigate if the tests are passing
     * Version of GitLab you are running; we will only investigate issues in the latest stable and development releases as per the [maintenance policy](MAINTENANCE.md)
-    * Add the last commit sha1 of the GitLab version you used to replicate the issue (obtainable from the help page)
+    * Add the last commit SHA-1 of the GitLab version you used to replicate the issue (obtainable from the help page)
     * Describe your setup (use relevant parts from `sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production`)
 1. **Possible fixes**: If you can, link to the line of code that might be responsible for the problem
@@ -76,7 +76,7 @@ If you can, please submit a merge request with the fix or improvements including
 The **official merge window** is in the beginning of the month from the 1st to the 7th day of the month. The best time to submit a MR and get feedback fast. Before this time the GitLab B.V. team is still dealing with work that is created by the monthly release such as assisting subscribers with upgrade issues, the release of Enterprise Edition and the upgrade of GitLab Cloud. After the 7th it is already getting closer to the release date of the next version. This means there is less time to fix the issues created by merging large new features.
-Please keep the change in a single MR **as small as possible**. If you want to contribute a large feature think very hard what the minimum viable change is. Can you split functionality? Can you only submit the backend/API code? Can you start with a very simple UI? Can you do part of the refactor? The increased reviewability of small MR's that leads to higher code quality is more important to us than having a mimimal commit log. The smaller a MR is the more likely it is it will be merged (quickly), after that you can send more MR's to enhance it.
+Please keep the change in a single MR **as small as possible**. If you want to contribute a large feature think very hard what the minimum viable change is. Can you split functionality? Can you only submit the backend/API code? Can you start with a very simple UI? Can you do part of the refactor? The increased reviewability of small MR's that leads to higher code quality is more important to us than having a minimal commit log. The smaller a MR is the more likely it is it will be merged (quickly), after that you can send more MR's to enhance it.
 For examples of feedback on merge requests please look at already [closed merge requests](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests?assignee_id=&label_name=&milestone_id=&scope=&sort=&state=closed). If you would like quick feedback on your merge request feel free to mention one of the Merge Marshalls of [the core-team](https://about.gitlab.com/core-team/). Please ensure that your merge request meets the following contribution acceptance criteria.
@@ -86,7 +86,7 @@ For examples of feedback on merge requests please look at already [closed merge
 1. Are there points in the code the reviewer needs to double check?
 1. Why was this MR needed?
 1. What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
-1. Screenshots (If appropiate)
+1. Screenshots (If appropriate)
 ## Contribution acceptance criteria
@@ -115,4 +115,4 @@ For examples of feedback on merge requests please look at already [closed merge
 1.  [Shell commands](doc/development/shell_commands.md) created by GitLab contributors to enhance security
 1.  [Markdown](http://www.cirosantilli.com/markdown-styleguide)
-This is also the style used by linting tools such as [Rubocop](https://github.com/bbatsov/rubocop), [PullReview](https://www.pullreview.com/) and [Hound CI](https://houndci.com).
+This is also the style used by linting tools such as [RuboCop](https://github.com/bbatsov/rubocop), [PullReview](https://www.pullreview.com/) and [Hound CI](https://houndci.com).

app/assets/javascripts/zen_mode.js.coffee

 class @ZenMode
   @fullscreen_prefix = 'fullscreen_'
-  @ESC = 27
   constructor: ->
     @active_zen_area = null
     @active_checkbox = null
     $('body').on 'change', '.zennable input[type=checkbox]', (e) =>
-      checkbox = e.currentTarget;
+      checkbox = e.currentTarget
       if checkbox.checked
         Mousetrap.pause()
         @udpateActiveZenArea(checkbox)
@@ -15,9 +14,9 @@ class @ZenMode
         @exitZenMode()
     $(document).on 'keydown', (e) =>
-      console.log("esc")
-      if e.keyCode is ZenMode.ESC
+      if e.keyCode is $.ui.keyCode.ESCAPE
         @exitZenMode()
+        e.preventDefault()
     $(window).on 'hashchange', @updateZenModeFromLocationHash
@@ -27,7 +26,7 @@ class @ZenMode
     @active_zen_area = @active_checkbox.parent().find('textarea')
     @active_zen_area.focus()
     window.location.hash = ZenMode.fullscreen_prefix + @active_checkbox.prop('id')
-  
+
   exitZenMode: =>
     if @active_zen_area isnt null
       Mousetrap.unpause()
@@ -48,4 +47,4 @@ class @ZenMode
     if checkbox
       @udpateActiveZenArea(checkbox)
     else
-      @exitZenMode()      
+      @exitZenMode()

app/assets/stylesheets/generic/issuable.scss

+/**
+ * Styles that apply to both issues and merge requests.
+ */
+
+.issue-form, .merge-request-form {
+  .description {
+    height: 20em;
+  }
+}

app/views/profiles/keys/index.html.haml

@@ -6,7 +6,7 @@
   SSH keys allow you to establish a secure connection between your computer and GitLab
   %br
   Before you can add an SSH key you need to
-  = link_to "generate it", help_page_path("ssh", "README")
+  = link_to "generate it", help_page_path("ssh", "ssh")
 %hr

app/views/projects/_issuable_form.html.haml

@@ -7,12 +7,8 @@
 .form-group.issuable-description
   = f.label :description, 'Description', class: 'control-label'
   .col-sm-10
-    .zennable
-      %input#zen-toggle-comment{ tabindex: '-1', type: 'checkbox' }
-      .zen-backdrop
-        = f.text_area :description, rows: 14, class: 'form-control js-gfm-input markdown-area', placeholder: 'Leave a comment'
-        %label{ for: 'zen-toggle-comment', class: 'expand' } Edit in fullscreen
-        %label{ for: 'zen-toggle-comment', class: 'collapse' }
+    = render 'projects/zen', f: f, attr: :description,
+                             classes: 'description form-control'
     .col-sm-12.hint
       .pull-left
         Parsed with

app/views/projects/_zen.html.haml

+.zennable
+  %input#zen-toggle-comment{ tabindex: '-1', type: 'checkbox' }
+  .zen-backdrop
+    - classes << ' js-gfm-input markdown-area'
+    = f.text_area attr, class: classes, placeholder: 'Leave a comment'
+    %label{ for: 'zen-toggle-comment', class: 'expand' } Edit in fullscreen
+    %label{ for: 'zen-toggle-comment', class: 'collapse' }

app/views/projects/merge_requests/_new_submit.html.haml

@@ -21,12 +21,8 @@
       .form-group
         .light
           = f.label :description, "Description"
-        .zennable
-          %input#zen-toggle-comment{ tabindex: '-1', type: 'checkbox' }
-          .zen-backdrop
-            = f.text_area :description, class: 'form-control js-gfm-input markdown-area', rows: 10, placeholder: 'Leave a comment'
-            %label{ for: 'zen-toggle-comment', class: 'expand' } Edit in fullscreen
-            %label{ for: 'zen-toggle-comment', class: 'collapse' }
+        = render 'projects/zen', f: f, attr: :description,
+                                 classes: 'description form-control'
         .clearfix.hint
           .pull-left Description is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}.
           .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector' }.

app/views/projects/notes/_form.html.haml

@@ -14,13 +14,8 @@
         Preview
   %div
     .note-write-holder
-      .zennable
-        %input#zen-toggle-comment{ tabindex: '-1', type: 'checkbox' }
-        .zen-backdrop
-          = f.text_area :note, size: 255, class: 'note_text js-note-text js-gfm-input markdown-area', placeholder: 'Leave a comment'
-          %label{ for: 'zen-toggle-comment', class: 'expand' } Edit in fullscreen
-          %label{ for: 'zen-toggle-comment', class: 'collapse' }
-
+      = render 'projects/zen', f: f, attr: :note,
+                               classes: 'note_text js-note-text'
       .light.clearfix
         .pull-left Comments are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"),{ target: '_blank', tabindex: -1 }}
         .pull-right Attach images (JPG, PNG, GIF) by dragging & dropping or #{link_to "selecting them", '#', class: 'markdown-selector', tabindex: -1 }.

doc/install/requirements.md

@@ -34,7 +34,7 @@ Please consider using a virtual machine to run GitLab.
 GitLab requires Ruby (MRI) 2.0 or 2.1
 You will have to use the standard MRI implementation of Ruby.
-We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab needs several Gems that have native extensions.
+We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/) but GitLab needs several Gems that have native extensions.
 ## Hardware requirements

doc/permissions/permissions.md

@@ -27,11 +27,11 @@ If a user is a GitLab administrator they receive all permissions.
 | Create new milestones                 |         |            |             | ✓        | ✓      |
 | Add new team members                  |         |            |             | ✓        | ✓      |
 | Push to protected branches            |         |            |             | ✓        | ✓      |
-| Enable/Disable branch protection      |         |            |             | ✓        | ✓      |
+| Enable/disable branch protection      |         |            |             | ✓        | ✓      |
 | Rewrite/remove git tags               |         |            |             | ✓        | ✓      |
 | Edit project                          |         |            |             | ✓        | ✓      |
-| Add Deploy Keys to project            |         |            |             | ✓        | ✓      |
-| Configure Project Hooks               |         |            |             | ✓        | ✓      |
+| Add deploy keys to project            |         |            |             | ✓        | ✓      |
+| Configure project hooks               |         |            |             | ✓        | ✓      |
 | Switch visibility level               |         |            |             |          | ✓      |
 | Transfer project to another namespace |         |            |             |          | ✓      |
 | Remove project                        |         |            |             |          | ✓      |

doc/release/monthly.md

@@ -113,7 +113,8 @@ Check if any of these changed since last release:
 - <https://gitlab.com/gitlab-org/gitlab-ce/commits/master/config/unicorn.rb.example>
 - <https://gitlab.com/gitlab-org/gitlab-ce/commits/master/config/database.yml.mysql>
 - <https://gitlab.com/gitlab-org/gitlab-ce/commits/master/config/database.yml.postgresql>
-- <https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/initializers/rack_attack.rb.example>
+- <https://gitlab.com/gitlab-org/gitlab-ce/commits/master/config/initializers/rack_attack.rb.example>
+- <https://gitlab.com/gitlab-org/gitlab-ce/commits/master/config/resque.yml.example>
 #### 8. Need to update init script?

doc/web_hooks/web_hooks.md

@@ -124,12 +124,14 @@ Save the following file as `print_http_body.rb`.
 ```ruby
 require 'webrick'
-server = WEBrick::HTTPServer.new(Port: ARGV.first)
+server = WEBrick::HTTPServer.new(:Port => ARGV.first)
 server.mount_proc '/' do |req, res|
   puts req.body
 end
-trap 'INT' do server.shutdown end
+trap 'INT' do 
+  server.shutdown 
+end
 server.start
 ```