Replace yaml_db fork with gem
This commit is contained in:
parent
96d49bf04c
commit
d863fa6283
4
Gemfile
4
Gemfile
|
@ -24,10 +24,12 @@ gem 'omniauth-github'
|
|||
# GITLAB patched libs
|
||||
gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: '7f35cb98ff17d534a07e3ce6ec3d580f67402837'
|
||||
gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e'
|
||||
gem 'yaml_db', git: "https://github.com/gitlabhq/yaml_db.git", ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd'
|
||||
gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
|
||||
gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '8e6afc2da821354774aa4d1ee8a1aa2082f84a3e'
|
||||
|
||||
# Dump db to yml file. Mostly used to migrate from sqlite to mysql
|
||||
gem 'gitlab_yaml_db', '1.0.0', require: "yaml_db"
|
||||
|
||||
# Gitolite client (for work with gitolite-admin repo)
|
||||
gem "gitolite", '1.1.0'
|
||||
|
||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -70,13 +70,6 @@ GIT
|
|||
sinatra (>= 0.9.2)
|
||||
vegas (~> 0.1.2)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/gitlabhq/yaml_db.git
|
||||
revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
|
||||
ref: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
|
||||
specs:
|
||||
yaml_db (0.2.2)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/jonleighton/poltergeist.git
|
||||
revision: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
|
||||
|
@ -205,6 +198,7 @@ GEM
|
|||
pygments.rb (>= 0.2.13)
|
||||
github-markup (0.7.4)
|
||||
gitlab_meta (4.0)
|
||||
gitlab_yaml_db (1.0.0)
|
||||
gitolite (1.1.0)
|
||||
gratr19 (~> 0.4.4.1)
|
||||
grit (~> 2.5.0)
|
||||
|
@ -492,6 +486,7 @@ DEPENDENCIES
|
|||
github-linguist (~> 2.3.4)
|
||||
github-markup (~> 0.7.4)
|
||||
gitlab_meta (= 4.0)
|
||||
gitlab_yaml_db (= 1.0.0)
|
||||
gitolite (= 1.1.0)
|
||||
grack!
|
||||
grape (~> 0.2.1)
|
||||
|
@ -546,4 +541,3 @@ DEPENDENCIES
|
|||
uglifier (~> 1.3.0)
|
||||
unicorn (~> 4.4.0)
|
||||
webmock
|
||||
yaml_db!
|
||||
|
|
Loading…
Reference in a new issue