• Grzegorz Bizon's avatar
    Merge branch 'master' into feature/issue-move · 797af064
    Grzegorz Bizon authored
    * master:
      Fix bug where wrong commit ID was being used in a merge request diff to show old image
      Remove CHANGELOG item that was added during merge resolution
      Improve the "easy WIP & un-WIP from link" feature
      Fix specs
      \#to_branch_name now uses the iid as postfix
      Add label description in tooltip to labels in issue index and sidebar
      Easily (un)mark merge request as WIP using link
      Use specialized system notes when MR is (un)marked as WIP
      another attempt to fix oauth issue
      attempting to fix omniauth problem
    
    Conflicts:
    	app/assets/javascripts/issuable_form.js.coffee
    797af064
issue.rb 4.19 KB