Grzegorz Bizon 0115ad66d2 Merge branch 'master' into feature/issue-move ... * 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		2016-03-19 18:50:15 +01:00
..
filter_by_milestone_spec.rb	Fixed failing milestone filter tests	2016-03-10 13:54:54 +00:00
move_spec.rb	Do not use javascript in specs for issue move	2016-03-17 12:25:17 +01:00
new_branch_button_spec.rb	Restrict access to references for confidential issues	2016-03-17 20:55:59 -03:00
note_polling_spec.rb	Trigger notes refresh in specs instead of waiting for ajax	2015-12-15 14:19:35 +01:00