• Lin Jen-Shin's avatar
    Merge remote-tracking branch 'upstream/master' into show-status-from-branch · 80b5ab5d
    Lin Jen-Shin authored
    * upstream/master: (126 commits)
      Allow to search for user by secondary email address in the admin interface
      Rename :name search parameter to :search_query at /admin/users
      Fix project features default values
      Add a link to the Issue Boards API in main README
      Fix Markdown styling inside reference links
      Fix relative links in Markdown wiki when displayed in "Project" tab
      Flexbox webkit prefixes
      Tests update
      Tests update
      Changed where merge request link is
      New todos blank state
      Implement CreateMembers service to make controller thin
      Do not show tooltip for active element (!7105)
      Update CHANGELOG
      Assign local_assigns[:subject] to a variable on the shared label partial
      Use select instead of pluck on Project.group_ids
      Skip authorization check when searching for labels on IssuableFinder
      Use label subject to calculate number of issues/mrs within the group
      Remove unnecessary includes(:priorities) on Projects::LabelsController
      Add 8.13.2 CHANGELOG entries
      ...
    80b5ab5d
merge_requests_controller.rb 19.1 KB