Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

22aaebdf

Commit 22aaebdf authored 8 years ago by Lin Jen-Shin

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into all-skipped-equals-success

* upstream/master:
  Fixed banzai test failures
  Removed puts code 
  Adds v-pre to code blocks in comments

parents 5c9ac560 7887a3da

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 0 deletions

CHANGELOG
lib/banzai/filter/sanitization_filter.rb 1 addition, 1 deletion

lib/banzai/filter/sanitization_filter.rb
lib/banzai/filter/syntax_highlight_filter.rb 1 addition, 1 deletion

lib/banzai/filter/syntax_highlight_filter.rb
spec/features/notes_on_merge_requests_spec.rb 12 additions, 0 deletions

spec/features/notes_on_merge_requests_spec.rb
spec/lib/banzai/filter/syntax_highlight_filter_spec.rb 4 additions, 4 deletions

spec/lib/banzai/filter/syntax_highlight_filter_spec.rb

with 19 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment