Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifacts-expiration

* upstream/master: (234 commits)
  Improve performance of User Agent Detail
  Fix some grammar in the API docs
  Remove shared example for pagination
  API: Use POST to (un)block a user
  API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar`
  Use grape validation for dates
  Change wording for LDAP doc that was moved to a new location
  API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`
  Download snippets with LF line-endings by default
  utilize pre-minified Vue in production since no CJS distribution is available
  Prevent project team from being truncated too early during project destruction
  loading icon sometimes toggled alongside MR pipeline contents
  fix failed spec because haml_lint
  fix incorrect sidekiq concurrency count in admin background page
  exclude rpc_pipefs from system disc info
  Fix wrong line ending [ci-skip]
  fix overlooked window binding in spec files
  remove imports loader
  replace implicit this == window with explicit binding
  Todo done clicking is kind of unusable.
  ...

.gitlab/issue_templates/Research Proposal.md

+### Background:
+
+(Include problem, use cases, benefits, and/or goals)
+
+**What questions are you trying to answer?**
+
+**Are you looking to verify an existing hypothesis or uncover new issues you should be exploring?**
+
+**What is the backstory of this project and how does it impact the approach?**
+
+**What do you already know about the areas you are exploring?**
+
+**What does success look like at the end of the project?**
+
+### Links / references:
+
+/label ~"UX research"

CHANGELOG.md

@@ -2,6 +2,22 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
+## 8.16.6 (2017-02-17)
+
+- API: Fix file downloading. !0 (8267)
+- Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms. !8752
+- Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory. !8891
+- Fix wrong call to ProjectCacheWorker.perform. !8910
+- Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index. !8956
+- Fix broken anchor links when special characters are used. !8961 (Andrey Krivko)
+- Do not display deploy keys in user's own ssh keys list. !9024
+- Show merge errors in merge request widget. !9229
+- Don't delete assigned MRs/issues when user is deleted.
+- backport of EE fix !954.
+- Refresh authorizations when transferring projects.
+- Don't use backup Active Record connections for Sidekiq.
+- Check public snippets for spam.
+
 ## 8.16.5 (2017-02-14)
 - Patch Asciidocs rendering to block XSS.
@@ -181,6 +197,10 @@ entry.
 - Add margin to markdown math blocks.
 - Add hover state to MR comment reply button.
+## 8.15.7 (2017-02-15)
+
+- No changes.
+
 ## 8.15.6 (2017-02-14)
 - Patch Asciidocs rendering to block XSS.
@@ -451,6 +471,10 @@ entry.
 - Whitelist next project names: help, ci, admin, search. !8227
 - Adds back CSS for progress-bars. !8237
+## 8.14.10 (2017-02-15)
+
+- No changes.
+
 ## 8.14.9 (2017-02-14)
 - Patch Asciidocs rendering to block XSS.

CONTRIBUTING.md

@@ -93,18 +93,20 @@ Please see the [UX Guide for GitLab].
 ### Retrospective
-After each release (usually on the 22nd of each month), we have a retrospective
-call where we discuss what went well, what went wrong, and what we can improve
-for the next release. The [retrospective notes] are public and you are invited
-to comment them.
-If you're interested, you can even join the [retrospective call][retro-kickoff-call].
+After each release, we have a retrospective call where we discuss what went well,
+what went wrong, and what we can improve for the next release. The
+[retrospective notes] are public and you are invited to comment on them.
+If you're interested, you can even join the
+[retrospective call][retro-kickoff-call], on the first working day after the
+22nd at 6pm CET / 9am PST.
 ### Kickoff
-Before working on the next release (usually on the 8th of each month), we have a
+Before working on the next release, we have a
 kickoff call to explain what we expect to ship in the next release. The
-[kickoff notes] are public and you are invited to comment them.
-If you're interested, you can even join the [kickoff call][retro-kickoff-call].
+[kickoff notes] are public and you are invited to comment on them.
+If you're interested, you can even join the [kickoff call][retro-kickoff-call],
+on the first working day after the 7th at 6pm CET / 9am PST..
 [retrospective notes]: https://docs.google.com/document/d/1nEkM_7Dj4bT21GJy0Ut3By76FZqCfLBmFQNVThmW2TY/edit?usp=sharing
 [kickoff notes]: https://docs.google.com/document/d/1ElPkZ90A8ey_iOkTvUs_ByMlwKK6NAB2VOK5835wYK0/edit?usp=sharing

app/assets/javascripts/admin.js

@@ -61,4 +61,4 @@
     return Admin;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/api.js

@@ -147,4 +147,4 @@
   };
   window.Api = Api;
-}).call(this);
+}).call(window);

app/assets/javascripts/application.js

@@ -101,11 +101,6 @@ require('es6-promise').polyfill();
       }
     });
-    $('.nav-sidebar').niceScroll({
-      cursoropacitymax: '0.4',
-      cursorcolor: '#FFF',
-      cursorborder: '1px solid #FFF'
-    });
     $('.js-select-on-focus').on('focusin', function () {
       return $(this).select().one('mouseup', function (e) {
         return e.preventDefault();
@@ -245,9 +240,7 @@ require('es6-promise').polyfill();
     });
     gl.awardsHandler = new AwardsHandler();
     new Aside();
-    // bind sidebar events
-    new gl.Sidebar();
     gl.utils.initTimeagoTimeout();
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/aside.js

@@ -22,4 +22,4 @@
     return Aside;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/autosave.js

@@ -59,4 +59,4 @@
     return Autosave;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/awards_handler.js

@@ -377,4 +377,4 @@ var emojiAliases = require('emoji-aliases');
     return AwardsHandler;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/behaviors/autosize.js

@@ -25,4 +25,4 @@ var autosize = require('vendor/autosize');
     autosize.update($fields);
     return $fields.css('resize', 'vertical');
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/behaviors/details_behavior.js

@@ -23,4 +23,4 @@
       return e.preventDefault();
     });
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/behaviors/quick_submit.js

@@ -74,4 +74,4 @@ require('../extensions/jquery');
       return $this.tooltip('hide');
     });
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/behaviors/requires_input.js

@@ -59,4 +59,4 @@ require('../extensions/jquery');
       return hideOrShowHelpBlock($form);
     });
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/blob/blob_file_dropzone.js

@@ -63,4 +63,4 @@
     return BlobFileDropzone;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/blob/blob_gitignore_selector.js

@@ -20,4 +20,4 @@ require('./template_selector');
     return BlobGitignoreSelector;
   })(gl.TemplateSelector);
-}).call(this);
+}).call(window);

app/assets/javascripts/blob/blob_gitignore_selectors.js

@@ -23,4 +23,4 @@
     return BlobGitignoreSelectors;
   })();
-}).call(this);
+}).call(window);

app/assets/javascripts/blob/blob_license_selector.js

@@ -25,4 +25,4 @@ require('./template_selector');
     return BlobLicenseSelector;
   })(gl.TemplateSelector);
-}).call(this);
+}).call(window);

app/assets/javascripts/blob_edit/blob_edit_bundle.js

@@ -12,4 +12,4 @@ require('./edit_blob');
     var blob = new EditBlob(url, $('.js-edit-blob-form').data('blob-language'));
     new NewCommitForm($('.js-edit-blob-form'));
   });
-}).call(this);
+}).call(window);

app/assets/javascripts/blob_edit/edit_blob.js

@@ -85,4 +85,4 @@
     return EditBlob;
   })();
-}).call(this);
+}).call(window);