gitlab-org--gitlab-foss/spec/lib
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
..
banzai Restrict access to references for confidential issues 2016-03-17 20:55:59 -03:00
ci adjusted behavior so canceled builds tagged as allowed to fail do not fail build 2016-03-17 07:55:10 -07:00
gitlab Merge branch 'master' into feature/issue-move 2016-03-19 18:50:15 +01:00
disable_email_interceptor_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
extracts_path_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
file_size_validator_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
git_ref_validator_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00
repository_cache_spec.rb Tag lib specs 2015-12-09 11:55:42 +01:00