• Tomasz Maczukin's avatar
    Merge branch 'master' into fix/visibility-level-setting-in-forked-projects · 3cfd892f
    Tomasz Maczukin authored
    * master: (723 commits)
      Bump Rack Attack to v4.3.1 for security fix
      Remove duplicate entry in the changelog
      Remove extra spaces after branchname
      Fix merge-request-reopen button title
      Add branch and tag operation to tree dropdown
      Use gitlab-shell 2.6.9
      Clarify Windows shell executor artifact upload support
      Fix feature specs: we always show the build status if ci_commit is present
      Do not display project group/name when issue and MR are in same project
      Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled
      Use gitlab-workhorse 0.5.1
      Fix ci_projects migration by using the value only from latest row [ci skip]
      Revert sidebar position for issue and merge request
      Add info on using private Docker registries in CI [ci skip]
      Upgrade Poltergeist to 1.8.1. #4131
      Fix ux issue with "This issue will be closed automatically" message
      Move MR Builds tab next to Commits
      Api support for requesting starred projects for user
      Fix Rubocop complain.
      Fix merge widget JS for buttons
      ...
    
    Conflicts:
    	app/models/project.rb
    3cfd892f
project.rb 25 KB