diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-03 13:32:17 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-03 13:32:17 +0300 |
| commit | 1c077cac8a70ada8eda4a099d5bee92950eeda5d (patch) | |
| tree | d5666bdf8e5d4b031780dfa0df4f6d8a21e0d18d | |
| parent | 0cc30145f441a16ce513bba942ea67ede4086a7f (diff) | |
| parent | b0a3276253498475029fe25bcaef0eacc9e27ee6 (diff) | |
| download | gitlab-ce-1c077cac8a70ada8eda4a099d5bee92950eeda5d.tar.gz | |
Merge pull request #7941 from Razer6/update/org-mode
Bump org-mode to 0.9.9
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -89,7 +89,7 @@ gem "github-markup" gem 'redcarpet', '~> 3.1.2' gem 'RedCloth' gem 'rdoc', '~>3.6' -gem 'org-ruby' +gem 'org-ruby', '= 0.9.9' gem 'creole', '~>0.3.6' gem 'wikicloth', '=0.8.1' gem 'asciidoctor', '= 0.1.4' diff --git a/Gemfile.lock b/Gemfile.lock index d0f29258ffa..3e029481eeb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -332,7 +332,7 @@ GEM omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) - org-ruby (0.9.8) + org-ruby (0.9.9) rubypants (~> 0.2) orm_adapter (0.5.0) pg (0.15.1) @@ -655,7 +655,7 @@ DEPENDENCIES omniauth-google-oauth2 omniauth-shibboleth omniauth-twitter - org-ruby + org-ruby (= 0.9.9) pg poltergeist (~> 1.5.1) pry |