diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-05-05 15:35:10 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-05-05 15:35:10 -0500 |
| commit | 61bc0c28c988f932473858283a988a41e9f4033a (patch) | |
| tree | 2922ef7b7573731acab82477c996f144390cb880 | |
| parent | aa874a1cd6fc94f6291a59fb414f3b09b3337c0d (diff) | |
| parent | 4b4fc943a3f4e6379cd5f59d2a3879b8d1ebb703 (diff) | |
| download | gitlab-ce-61bc0c28c988f932473858283a988a41e9f4033a.tar.gz | |
Merge branch 'add-ruby-parser-dependency'
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -257,6 +257,7 @@ gem 'sentry-raven', '~> 2.4.0' gem 'premailer-rails', '~> 1.9.0' # I18n +gem 'ruby_parser', '~> 3.8.4', require: false gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.2.0' gem 'gettext', '~> 3.2.2', require: false, group: :development diff --git a/Gemfile.lock b/Gemfile.lock index c7e3f9935da..01c35a935f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1012,6 +1012,7 @@ DEPENDENCIES rubocop-rspec (~> 1.15.0) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.16.2) + ruby_parser (~> 3.8.4) rufus-scheduler (~> 3.1.10) rugged (~> 0.25.1.1) sanitize (~> 2.0) |