diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-09 11:18:21 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-09 11:18:21 +0100 |
| commit | 905090dbe9d140ef950995c63204a864a161dbdb (patch) | |
| tree | 8785fe0459b3009c353a30f29283f8993866bae8 | |
| parent | 7e8dc22dd7fb730d3fc47150cdfe95dc9ffdbc3a (diff) | |
| download | gitlab-ce-905090dbe9d140ef950995c63204a864a161dbdb.tar.gz | |
Remove RedCloth and no longer allow bundle-audit to fail
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8290fb36b2..c6d1e622bd0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,10 +89,9 @@ flay: - mysql bundler:audit: - script: + script: - "bundle exec bundle-audit update" - "bundle exec bundle-audit check" tags: - ruby - mysql - allow_failure: true @@ -93,7 +93,6 @@ 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' diff --git a/Gemfile.lock b/Gemfile.lock index 3979418ed45..37ba22b7ceb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,6 @@ 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,7 +825,6 @@ 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) |