Download as
Browse Code »

Commit 630c547dbdfd688da4efced9428779f228242ef2

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

Updated gems. Replaced gollum with gollum-lib

Showing 2 changed files with 15 additions and 33 deletions   Show diff stats
@@ -91,16 +91,11 @@ gem "colored" @@ -91,16 +91,11 @@ gem "colored"
91 # GitLab settings 91 # GitLab settings
92 gem 'settingslogic' 92 gem 'settingslogic'
93 93
94 -# Wiki  
95 -# - Use latest master to resolve Gem dependency with Pygemnts  
96 -# github-linquist needs pygments 0.4.2 but Gollum 2.4.11  
97 -# requires pygments 0.3.2. The latest master Gollum has been updated  
98 -# to use pygments 0.4.2. Change this after next Gollum release.  
99 -gem "gollum", "~> 2.4.0", git: "https://github.com/gollum/gollum.git", ref: "5dcd3c8c8f" 94 +# Git Wiki
  95 +gem "gollum-lib", "~> 1.0.0"
100 96
101 # Misc 97 # Misc
102 gem "foreman" 98 gem "foreman"
103 -gem "git"  
104 99
105 # Cache 100 # Cache
106 gem "redis-rails" 101 gem "redis-rails"
@@ -23,23 +23,6 @@ GIT @@ -23,23 +23,6 @@ GIT
23 raphael-rails (2.1.0) 23 raphael-rails (2.1.0)
24 24
25 GIT 25 GIT
26 - remote: https://github.com/gollum/gollum.git  
27 - revision: 5dcd3c8c8f68158e43ff79861279088ee56d0ebe  
28 - ref: 5dcd3c8c8f  
29 - specs:  
30 - gollum (2.4.11)  
31 - github-markdown (~> 0.5.3)  
32 - github-markup (>= 0.7.5, < 1.0.0)  
33 - grit (~> 2.5.0)  
34 - mustache (>= 0.99.4, < 1.0.0)  
35 - nokogiri (~> 1.5.6)  
36 - pygments.rb (~> 0.4.2)  
37 - sanitize (~> 2.0.3)  
38 - sinatra (~> 1.3.5)  
39 - stringex (~> 1.5.1)  
40 - useragent (~> 0.4.16)  
41 -  
42 -GIT  
43 remote: https://github.com/jonleighton/poltergeist.git 26 remote: https://github.com/jonleighton/poltergeist.git
44 revision: 9645b52009e258921b860d3b7601d00008b22c45 27 revision: 9645b52009e258921b860d3b7601d00008b22c45
45 ref: 9645b52009e258921b860d3b7601d00008b22c45 28 ref: 9645b52009e258921b860d3b7601d00008b22c45
@@ -162,14 +145,13 @@ GEM @@ -162,14 +145,13 @@ GEM
162 eventmachine (>= 0.12.0) 145 eventmachine (>= 0.12.0)
163 ffaker (1.15.0) 146 ffaker (1.15.0)
164 ffi (1.6.0) 147 ffi (1.6.0)
165 - font-awesome-sass-rails (3.0.0.1) 148 + font-awesome-sass-rails (3.0.2.2)
166 railties (>= 3.1.1) 149 railties (>= 3.1.1)
167 sass-rails (>= 3.1.1) 150 sass-rails (>= 3.1.1)
168 - foreman (0.61.0) 151 + foreman (0.62.0)
169 thor (>= 0.13.6) 152 thor (>= 0.13.6)
170 gemoji (1.2.1) 153 gemoji (1.2.1)
171 gherkin-ruby (0.2.1) 154 gherkin-ruby (0.2.1)
172 - git (1.2.5)  
173 github-linguist (2.3.4) 155 github-linguist (2.3.4)
174 charlock_holmes (~> 0.6.6) 156 charlock_holmes (~> 0.6.6)
175 escape_utils (~> 0.2.3) 157 escape_utils (~> 0.2.3)
@@ -188,6 +170,14 @@ GEM @@ -188,6 +170,14 @@ GEM
188 omniauth (~> 1.0) 170 omniauth (~> 1.0)
189 pyu-ruby-sasl (~> 0.0.3.1) 171 pyu-ruby-sasl (~> 0.0.3.1)
190 rubyntlm (~> 0.1.1) 172 rubyntlm (~> 0.1.1)
  173 + gollum-lib (1.0.0)
  174 + github-markdown (~> 0.5.3)
  175 + github-markup (>= 0.7.5, < 1.0.0)
  176 + grit (~> 2.5.0)
  177 + nokogiri (~> 1.5.9)
  178 + pygments.rb (~> 0.4.2)
  179 + sanitize (~> 2.0.3)
  180 + stringex (~> 1.5.1)
191 gon (4.0.2) 181 gon (4.0.2)
192 grape (0.3.2) 182 grape (0.3.2)
193 activesupport 183 activesupport
@@ -264,7 +254,6 @@ GEM @@ -264,7 +254,6 @@ GEM
264 multi_json (1.7.2) 254 multi_json (1.7.2)
265 multi_xml (0.5.3) 255 multi_xml (0.5.3)
266 multipart-post (1.1.5) 256 multipart-post (1.1.5)
267 - mustache (0.99.4)  
268 mysql2 (0.3.11) 257 mysql2 (0.3.11)
269 net-ldap (0.2.2) 258 net-ldap (0.2.2)
270 nokogiri (1.5.9) 259 nokogiri (1.5.9)
@@ -318,7 +307,7 @@ GEM @@ -318,7 +307,7 @@ GEM
318 rack (>= 1.1.3) 307 rack (>= 1.1.3)
319 rack-mount (0.8.3) 308 rack-mount (0.8.3)
320 rack (>= 1.0.0) 309 rack (>= 1.0.0)
321 - rack-protection (1.4.0) 310 + rack-protection (1.5.0)
322 rack 311 rack
323 rack-ssl (1.3.3) 312 rack-ssl (1.3.3)
324 rack 313 rack
@@ -426,7 +415,7 @@ GEM @@ -426,7 +415,7 @@ GEM
426 multi_json (~> 1.0) 415 multi_json (~> 1.0)
427 simplecov-html (~> 0.7.1) 416 simplecov-html (~> 0.7.1)
428 simplecov-html (0.7.1) 417 simplecov-html (0.7.1)
429 - sinatra (1.3.5) 418 + sinatra (1.3.6)
430 rack (~> 1.4) 419 rack (~> 1.4)
431 rack-protection (~> 1.3) 420 rack-protection (~> 1.3)
432 tilt (~> 1.3, >= 1.3.3) 421 tilt (~> 1.3, >= 1.3.3)
@@ -471,7 +460,6 @@ GEM @@ -471,7 +460,6 @@ GEM
471 uglifier (1.3.0) 460 uglifier (1.3.0)
472 execjs (>= 0.3.0) 461 execjs (>= 0.3.0)
473 multi_json (~> 1.0, >= 1.0.2) 462 multi_json (~> 1.0, >= 1.0.2)
474 - useragent (0.4.16)  
475 virtus (0.5.4) 463 virtus (0.5.4)
476 backports (~> 2.6.1) 464 backports (~> 2.6.1)
477 descendants_tracker (~> 0.0.1) 465 descendants_tracker (~> 0.0.1)
@@ -509,14 +497,13 @@ DEPENDENCIES @@ -509,14 +497,13 @@ DEPENDENCIES
509 font-awesome-sass-rails (~> 3.0.0) 497 font-awesome-sass-rails (~> 3.0.0)
510 foreman 498 foreman
511 gemoji (~> 1.2.1) 499 gemoji (~> 1.2.1)
512 - git  
513 github-linguist (~> 2.3.4) 500 github-linguist (~> 2.3.4)
514 github-markup (~> 0.7.4) 501 github-markup (~> 0.7.4)
515 gitlab-grack (~> 1.0.0) 502 gitlab-grack (~> 1.0.0)
516 gitlab-pygments.rb (~> 0.3.2) 503 gitlab-pygments.rb (~> 0.3.2)
517 gitlab_meta (= 5.0) 504 gitlab_meta (= 5.0)
518 gitlab_omniauth-ldap (= 1.0.2) 505 gitlab_omniauth-ldap (= 1.0.2)
519 - gollum (~> 2.4.0)! 506 + gollum-lib (~> 1.0.0)
520 gon 507 gon
521 grape (~> 0.3.1) 508 grape (~> 0.3.1)
522 grape-entity (~> 0.2.0) 509 grape-entity (~> 0.2.0)