Download as
Browse Code »

Commit d863fa6283c80eaf2d549b73bf778b78a94ff89c

Authored by Dmitriy Zaporozhets
1 parent 96d49bf0
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Replace yaml_db fork with gem

Showing 2 changed files with 5 additions and 9 deletions   Show diff stats
Gemfile
  Diff comments   View file @d863fa6
... ... @@ -24,10 +24,12 @@ gem 'omniauth-github'
24 24 # GITLAB patched libs
25 25 gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: '7f35cb98ff17d534a07e3ce6ec3d580f67402837'
26 26 gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e'
27   -gem 'yaml_db', git: "https://github.com/gitlabhq/yaml_db.git", ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd'
28 27 gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
29 28 gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '8e6afc2da821354774aa4d1ee8a1aa2082f84a3e'
30 29  
  30 +# Dump db to yml file. Mostly used to migrate from sqlite to mysql
  31 +gem 'gitlab_yaml_db', '1.0.0', require: "yaml_db"
  32 +
31 33 # Gitolite client (for work with gitolite-admin repo)
32 34 gem "gitolite", '1.1.0'
33 35  
... ...
Gemfile.lock
  Diff comments   View file @d863fa6
... ... @@ -71,13 +71,6 @@ GIT
71 71 vegas (~> 0.1.2)
72 72  
73 73 GIT
74   - remote: https://github.com/gitlabhq/yaml_db.git
75   - revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
76   - ref: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
77   - specs:
78   - yaml_db (0.2.2)
79   -
80   -GIT
81 74 remote: https://github.com/jonleighton/poltergeist.git
82 75 revision: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
83 76 ref: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
... ... @@ -205,6 +198,7 @@ GEM
205 198 pygments.rb (>= 0.2.13)
206 199 github-markup (0.7.4)
207 200 gitlab_meta (4.0)
  201 + gitlab_yaml_db (1.0.0)
208 202 gitolite (1.1.0)
209 203 gratr19 (~> 0.4.4.1)
210 204 grit (~> 2.5.0)
... ... @@ -492,6 +486,7 @@ DEPENDENCIES
492 486 github-linguist (~> 2.3.4)
493 487 github-markup (~> 0.7.4)
494 488 gitlab_meta (= 4.0)
  489 + gitlab_yaml_db (= 1.0.0)
495 490 gitolite (= 1.1.0)
496 491 grack!
497 492 grape (~> 0.2.1)
... ... @@ -546,4 +541,3 @@ DEPENDENCIES
546 541 uglifier (~> 1.3.0)
547 542 unicorn (~> 4.4.0)
548 543 webmock
549   - yaml_db!
... ...