Commit graph

17 commits

Author SHA1 Message Date
Francisco Javier López
bf0331dc72 Resolve "DashboardController#activity.json is slow due to SQL" 2017-11-06 16:52:56 +00:00
Yorick Peterse
b4aaced71a
Fix display of push events for removed refs
This changes the style of push events that remove tags or branches so
they don't display the commit details. This prevents displaying commit
details such as:

    000000 . --broken encoding

Instead we now simply display the header such as:

    Administrator deleted branch example-branch

This is displayed in the same style as events for newly created
branches/tags.

This commit also ensures that if no commit message is present we simply
don't display anything, instead of "--broken encoding".

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36685
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36722
2017-08-22 20:15:45 +02:00
Tim Zallmann
2bfee0706a Resolve "User profile activity feed contains broken image links" 2017-08-21 09:45:46 +00:00
Robert Speicher
72a7b30c9f Change all :empty_project to :project 2017-08-02 17:47:31 -04:00
Douwe Maan
0be3187a56 Pull preserve into render helpers 2017-04-28 11:37:19 -05:00
Robert Speicher
2e8aa209f0 Merge branch '30125-markdown-security'
Remove class from SanitizationFilter whitelist

See merge request !2079
2017-04-05 21:03:46 -07:00
Douwe Maan
f90909307e Fix specs 2017-03-14 15:29:31 -06:00
mhasbini
9bcd05401d whitelist style attribute in event_note 2017-03-07 12:08:59 +02:00
Nick Thomas
4012c695cb Stop event_commit_title from escaping its output
Return a non-html-safe, unescaped String instead of ActiveSupport::SafeBuffer
to preserve safety when the output is misused. Currently there's oly one user,
which does the right thing.

Closes #23311
2016-10-18 13:49:52 +01:00
tiagonbotelho
519275c110 fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
http://jneen.net/
734ed9c59a expect final newlines from the banzai filter 2016-07-14 10:08:16 -07:00
Robert Speicher
05bbad5817 Clean up EventsHelper spec 2016-05-12 16:52:56 -05:00
Robert Speicher
d6a145d4b0 Fix two more failing specs 2015-08-25 16:26:20 -07:00
Stan Hu
15d5dfdb33 Fix diff syntax highlighting
Refactored HTML parser to avoid duplication of newline parsing.

Closes #2235
2015-08-10 08:07:26 -07:00
Stan Hu
4218a2bfcf Fix code preview theme setting for comments, issues, merge requests, and snippets.
Also preserve code preview color scheme in events dashboard.

Assign default colors to all code blocks shown as <pre class="code highlight [color_scheme]">

Closes #1139
2015-03-10 08:11:20 -07:00
Stefan Tatschner
089516209c Fixed tests 2015-01-15 14:01:12 +01:00
Vinnie Okada
b3c70d001d Improve dashboard note view and add tests
Update the `#first_line_in_markdown` method so that the first line of
parsed text is displayed more reliably, and the continuation indicators
("...") are displayed in all cases where the note is truncated.

Also add Rspec tests for `EventsHelper#event_note`.
2014-10-12 23:56:56 -05:00