Download as
Browse Code »

Commit 72ee345d3a0213c6df78f5f56cd1dd26ff7c53e1

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

Remove grit fork reference from Gemfile. Use gitlab-gollum-lib gem

Showing 2 changed files with 21 additions and 31 deletions   Show diff stats
Gemfile
  Diff comments   View file @72ee345
... ... @@ -22,9 +22,7 @@ gem 'omniauth-twitter'
22 22 gem 'omniauth-github'
23 23  
24 24 # Extracting information from a git repository
25   -# We cannot use original git since some bugs
26   -gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git'
27   -gem 'gitlab_git', '~> 1.1.0'
  25 +gem 'gitlab_git', '~> 1.2.0'
28 26  
29 27 # Ruby/Rack Git Smart-HTTP Server Handler
30 28 gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
... ... @@ -35,6 +33,9 @@ gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
35 33 # Syntax highlighter
36 34 gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb'
37 35  
  36 +# Git Wiki
  37 +gem "gitlab-gollum-lib", "~> 1.0.0", require: 'gollum-lib'
  38 +
38 39 # Language detection
39 40 gem "github-linguist", require: "linguist"
40 41  
... ... @@ -93,9 +94,6 @@ gem "colored"
93 94 # GitLab settings
94 95 gem 'settingslogic'
95 96  
96   -# Git Wiki
97   -gem "gollum-lib", "~> 1.0.0"
98   -
99 97 # Misc
100 98 gem "foreman"
101 99  
... ...
Gemfile.lock
  Diff comments   View file @72ee345
... ... @@ -7,15 +7,6 @@ GIT
7 7 rake (>= 0.8.7)
8 8  
9 9 GIT
10   - remote: https://github.com/gitlabhq/grit.git
11   - revision: e873bb84ac3c4f8249311490d6a7c6ac9127625f
12   - specs:
13   - grit (2.5.0)
14   - diff-lcs (~> 1.1)
15   - mime-types (~> 1.15)
16   - posix-spawn (~> 0.3.6)
17   -
18   -GIT
19 10 remote: https://github.com/gitlabhq/raphael-rails.git
20 11 revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
21 12 specs:
... ... @@ -159,30 +150,34 @@ GEM
159 150 pygments.rb (>= 0.2.13)
160 151 github-markdown (0.5.3)
161 152 github-markup (0.7.5)
  153 + gitlab-gollum-lib (1.0.0)
  154 + github-markdown (~> 0.5.3)
  155 + github-markup (>= 0.7.5, < 1.0.0)
  156 + gitlab-grit (~> 2.5.1)
  157 + nokogiri (~> 1.5.9)
  158 + pygments.rb (~> 0.4.2)
  159 + sanitize (~> 2.0.3)
  160 + stringex (~> 1.5.1)
162 161 gitlab-grack (1.0.0)
163 162 rack (~> 1.4.1)
  163 + gitlab-grit (2.5.1)
  164 + charlock_holmes (~> 0.6.9)
  165 + diff-lcs (~> 1.1)
  166 + mime-types (~> 1.15)
  167 + posix-spawn (~> 0.3.6)
164 168 gitlab-pygments.rb (0.3.2)
165 169 posix-spawn (~> 0.3.6)
166 170 yajl-ruby (~> 1.1.0)
167   - gitlab_git (1.1.0)
  171 + gitlab_git (1.2.0)
168 172 activesupport (~> 3.2.13)
169 173 github-linguist (~> 2.3.4)
170   - grit (~> 2.5.0)
171   - grit_ext (~> 0.8.1)
  174 + gitlab-grit (~> 2.5.1)
172 175 gitlab_meta (5.0)
173 176 gitlab_omniauth-ldap (1.0.2)
174 177 net-ldap (~> 0.2.2)
175 178 omniauth (~> 1.0)
176 179 pyu-ruby-sasl (~> 0.0.3.1)
177 180 rubyntlm (~> 0.1.1)
178   - gollum-lib (1.0.0)
179   - github-markdown (~> 0.5.3)
180   - github-markup (>= 0.7.5, < 1.0.0)
181   - grit (~> 2.5.0)
182   - nokogiri (~> 1.5.9)
183   - pygments.rb (~> 0.4.2)
184   - sanitize (~> 2.0.3)
185   - stringex (~> 1.5.1)
186 181 gon (4.1.0)
187 182 actionpack (>= 2.3.0)
188 183 json
... ... @@ -199,8 +194,6 @@ GEM
199 194 grape-entity (0.3.0)
200 195 activesupport
201 196 multi_json (>= 1.3.2)
202   - grit_ext (0.8.1)
203   - charlock_holmes (~> 0.6.9)
204 197 growl (1.0.3)
205 198 guard (1.8.0)
206 199 formatador (>= 0.2.4)
... ... @@ -516,16 +509,15 @@ DEPENDENCIES
516 509 gemoji (~> 1.2.1)
517 510 github-linguist
518 511 github-markup (~> 0.7.4)
  512 + gitlab-gollum-lib (~> 1.0.0)
519 513 gitlab-grack (~> 1.0.0)
520 514 gitlab-pygments.rb (~> 0.3.2)
521   - gitlab_git (~> 1.1.0)
  515 + gitlab_git (~> 1.2.0)
522 516 gitlab_meta (= 5.0)
523 517 gitlab_omniauth-ldap (= 1.0.2)
524   - gollum-lib (~> 1.0.0)
525 518 gon
526 519 grape
527 520 grape-entity
528   - grit (~> 2.5.0)!
529 521 growl
530 522 guard-rspec
531 523 guard-spinach
... ...