diff options
| author | Nick Thomas <nick@gitlab.com> | 2016-10-06 22:55:27 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2016-10-07 02:54:26 +0100 |
| commit | dd159a750b294ee89cb8a4143284ff9788b639fc (patch) | |
| tree | b70548ebd7173130a5c32903874f527175943671 /Gemfile.lock | |
| parent | 109816c42fbe44fca108b52308a5fa4366876216 (diff) | |
| download | gitlab-ce-dd159a750b294ee89cb8a4143284ff9788b639fc.tar.gz | |
Make search results use the markdown cache columns, treating them consistently
Truncato is introduced as a dependency to intelligently shorten the rendered
HTML to 200 characters; the previous approach could have resulted in invalid
HTML being rendered.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 96b49faf727..b98c3acf948 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -745,6 +745,9 @@ GEM tilt (2.0.5) timecop (0.8.1) timfel-krb5-auth (0.8.3) + truncato (0.7.8) + htmlentities (~> 4.3.1) + nokogiri (~> 1.6.1) turbolinks (2.5.3) coffee-rails tzinfo (1.2.2) @@ -971,6 +974,7 @@ DEPENDENCIES test_after_commit (~> 0.4.2) thin (~> 1.7.0) timecop (~> 0.8.0) + truncato (~> 0.7.8) turbolinks (~> 2.5.0) u2f (~> 0.2.1) uglifier (~> 2.7.2) |