• Grzegorz Bizon's avatar
    Merge branch 'master' into ci/persist-registration-token · 2ec93abe
    Grzegorz Bizon authored
    * master: (66 commits)
      Fix runners admin view
      Fix migrations
      Rename mention of gitlab-git-http-server to gitlab-workhorse
      Bump Redis requirement to 2.8 for Sidekiq 4 requirements
      Fix wording on runner setup page
      add details on how to change saml button label
      Fix tests
      Move awards back to gray panel and few improvements to sidebar
      Few UI improvements to new sidebar implementation
      Fix tests for new issuable sidebar
      Update changelog
      Implement new sidebar for merge request page
      Make edit link on issuable sidebar works
      Redesign issue page for new sidebar
      Move awards css to separate file
      Implement issuable sidebar partial
      Update CHANGELOG
      Clarify cache behavior
      Run builds from projects with enabled CI
      Use Gitlab::Git instead of Ci::Git
      ...
    
    Conflicts:
    	db/schema.rb
    2ec93abe
index.html.haml 2.01 KB