• Grzegorz Bizon's avatar
    Merge branch 'master' into feature/issue-move · 0115ad66
    Grzegorz Bizon authored
    * master: (121 commits)
      Dedupe labels in labels selector in Dashboard pages
      Refactor colors and lists
      Add a safeguard in MergeRequest#compute_diverged_commits_count
      Fix an issue when the target branch of a MR had been deleted
      Add avatar to issue and MR pages header
      Cleanup somce css colors
      Re-group scss variables
      Refactor `Todo#target`
      Fixes issue with filter label missing on labels & milestones
      Rename `Todo#to_reference` to `Todo#target_reference`
      Fixed failing tests
      Updated controller with before_action Fixed other issues based on feedback
      Fixes issue on dashboard issues
      Full labels data in JSON
      Fixed issue with labels dropdown getting wrong labels
      Update CHANGELOG
      Use `Note#for_project_snippet?` to skip notes on project snippet
      Use `Commit#short_id` instead of `Commit.truncate_sha`
      Reuse `for_commit?` on conditional validations
      Update schema info comment on todo related files
      ...
    
    Conflicts:
    	app/models/issue.rb
    	db/schema.rb
    	spec/models/issue_spec.rb
    0115ad66
user.rb 25.7 KB