summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2014-05-28 12:23:03 +0200
committerMarin Jankovski <marin@gitlab.com>2014-05-28 12:23:03 +0200
commitdc158af665a32a28e19ef7efd849fdb7f22e7b6c (patch)
tree5d547cf06b1dd45c2a928175e9e0512d7791fd86 /Gemfile.lock
parent8a3807c83880f71612b1e092c49e865d24e29704 (diff)
downloadgitlab-ce-dc158af665a32a28e19ef7efd849fdb7f22e7b6c.tar.gz
Add org-ruby for rendering .org files.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 3d4a673af1c..3def12c053c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -319,6 +319,8 @@ GEM
omniauth-twitter (1.0.1)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
+ org-ruby (0.9.6)
+ rubypants (>= 0.2.0)
orm_adapter (0.5.0)
pg (0.15.1)
phantomjs (1.9.2.0)
@@ -427,6 +429,7 @@ GEM
rspec-mocks (~> 2.14.0)
ruby-progressbar (1.2.0)
rubyntlm (0.1.1)
+ rubypants (0.2.0)
rugged (0.19.0)
safe_yaml (0.9.7)
sanitize (2.1.0)
@@ -625,6 +628,7 @@ DEPENDENCIES
omniauth-github
omniauth-google-oauth2
omniauth-twitter
+ org-ruby
pg
poltergeist (~> 1.4.1)
protected_attributes