gitlab-org--gitlab-foss/lib/banzai
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 Merge branch 'master' into feature/issue-move 2016-03-19 18:50:15 +01:00
pipeline Move reference unfolder for GFM to separate class 2016-03-17 07:39:15 +01:00
cross_project_reference.rb Prevent circular reference error in Banzai 2016-01-14 11:30:28 +01:00
filter.rb Prevent circular reference error in Banzai 2016-01-14 11:30:28 +01:00
filter_array.rb Add FilterArray class to Banzai 2016-03-01 15:54:35 -05:00
lazy_reference.rb Prevent circular reference error in Banzai 2016-01-14 11:30:28 +01:00
pipeline.rb Prevent circular reference error in Banzai 2016-01-14 11:30:28 +01:00
querying.rb Optimize CSS expressions produced by Nokogiri 2015-12-31 15:46:47 +01:00
reference_extractor.rb Prevent circular reference error in Banzai 2016-01-14 11:30:28 +01:00
renderer.rb Add a PreProcessPipeline 2016-03-02 22:19:36 -05:00