Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
22999a6f
Commit
22999a6f
authored
Dec 11, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'remove-redcloth' into 'master'
This reverts commit
e426c027
, reversing changes made to
c3676aa1
.
parent
a2a68858
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
2 deletions
+6
-2
.gitlab-ci.yml
.gitlab-ci.yml
+2
-1
Gemfile
Gemfile
+1
-0
Gemfile.lock
Gemfile.lock
+2
-0
spec/features/atom/users_spec.rb
spec/features/atom/users_spec.rb
+1
-1
No files found.
.gitlab-ci.yml
View file @
22999a6f
...
...
@@ -123,3 +123,4 @@ bundler:audit:
tags
:
-
ruby
-
mysql
allow_failure
:
true
Gemfile
View file @
22999a6f
...
...
@@ -93,6 +93,7 @@ gem 'html-pipeline', '~> 1.11.0'
gem
'
task_list
'
,
'~> 1.0.2'
,
require:
'task_list/railtie'
gem
'
github-markup
'
,
'~> 1.3.1'
gem
'
redcarpet
'
,
'~> 3.3.3'
gem
'
RedCloth
'
,
'~> 4.2.9'
gem
'
rdoc
'
,
'~>3.6'
gem
'
org-ruby
'
,
'~> 0.9.12'
gem
'
creole
'
,
'~> 0.5.0'
...
...
Gemfile.lock
View file @
22999a6f
...
...
@@ -2,6 +2,7 @@ GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.2)
RedCloth (4.2.9)
ace-rails-ap (2.0.1)
actionmailer (4.2.4)
actionpack (= 4.2.4)
...
...
@@ -826,6 +827,7 @@ PLATFORMS
ruby
DEPENDENCIES
RedCloth (~> 4.2.9)
ace-rails-ap (~> 2.0.1)
activerecord-deprecated_finders (~> 1.0.3)
activerecord-session_store (~> 0.1.0)
...
...
spec/features/atom/users_spec.rb
View file @
22999a6f
...
...
@@ -79,6 +79,6 @@ describe "User Feed", feature: true do
end
def
safe_name
CGI
.
escapeHTML
(
user
.
name
)
html_escape
(
user
.
name
)
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment