summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-16 03:46:43 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-16 03:46:43 -0800
commitb339c747a9943e9961239a234dcd6e16566a53e1 (patch)
treef933d5d04aa155fb55941c5bc9175dbb6eacc917 /Gemfile.lock
parentc7aeb5127e3e7e852ed76096ad90a68ebd1195fa (diff)
parent245544a9d9807c6875eb7b3d63ab6d76468464d6 (diff)
downloadgitlab-ce-b339c747a9943e9961239a234dcd6e16566a53e1.tar.gz
Merge pull request #1937 from riyad/add-file-line-links
Add file line links
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock14
1 files changed, 10 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 76e92cd9d2f..3c1fa68dcb1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,6 +42,15 @@ GIT
rubyntlm (~> 0.1.1)
GIT
+ remote: https://github.com/gitlabhq/pygments.rb.git
+ revision: 4db80c599067e2d5f23c5c243bf85b8ca0368ad4
+ ref: 4db80c599067e2d5f23c5c243bf85b8ca0368ad4
+ specs:
+ pygments.rb (0.3.2)
+ posix-spawn (~> 0.3.6)
+ yajl-ruby (~> 1.1.0)
+
+GIT
remote: https://github.com/gitlabhq/yaml_db.git
revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
ref: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
@@ -271,9 +280,6 @@ GEM
coderay (~> 1.0.5)
method_source (~> 0.7.1)
slop (>= 2.4.4, < 3)
- pygments.rb (0.3.1)
- posix-spawn (~> 0.3.6)
- yajl-ruby (~> 1.1.0)
pyu-ruby-sasl (0.0.3.3)
quiet_assets (1.0.1)
railties (~> 3.1)
@@ -470,7 +476,7 @@ DEPENDENCIES
pg
poltergeist
pry
- pygments.rb (= 0.3.1)
+ pygments.rb!
quiet_assets (= 1.0.1)
rack-mini-profiler
rails (= 3.2.9)