1. 26 Jan, 2017 2 commits
    • Lin Jen-Shin's avatar
    • Lin Jen-Shin's avatar
      Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file · 4587c78a
      Lin Jen-Shin authored
      * upstream/master: (1122 commits)
        Update CHANGELOG.md for 8.16.2
        Display project ID in project settings (!8572)
        fixed points from comments to improve code quality
        Update CHANGELOG.md for 8.14.8
        Statisfy eslint
        Add CHANGELOG entry
        Fix access to the wiki code via HTTP when repository feature disabled
        Display fullscreen button on small screens (!5302)
        Prevent removing fields from dropdowns on input elements
        fix for all themes
        Return struct instead of multiple values
        Fix race conditions for AuthorizedProjectsWorker
        Add User#nested_groups and User#nested_projects methods
        Fix spec failure due to timestamp ordering issue in mySQL
        Fixed error with filter keyboard tests
        `can?` already includes the `feature_available?` check
        Test there is no Merge Request button when MRs are disabled
        Ensure the correct Merge Request button is found
        Add 409 conflict tests
        Add CHANGELOG
        ...
      4587c78a
  2. 25 Jan, 2017 38 commits