Commit 630c547dbdfd688da4efced9428779f228242ef2
1 parent
1743cbf1
Exists in
master
and in
4 other branches
Updated gems. Replaced gollum with gollum-lib
Showing
2 changed files
with
15 additions
and
33 deletions
Show diff stats
Gemfile
| ... | ... | @@ -91,16 +91,11 @@ gem "colored" |
| 91 | 91 | # GitLab settings |
| 92 | 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 | 97 | # Misc |
| 102 | 98 | gem "foreman" |
| 103 | -gem "git" | |
| 104 | 99 | |
| 105 | 100 | # Cache |
| 106 | 101 | gem "redis-rails" | ... | ... |
Gemfile.lock
| ... | ... | @@ -23,23 +23,6 @@ GIT |
| 23 | 23 | raphael-rails (2.1.0) |
| 24 | 24 | |
| 25 | 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 | 26 | remote: https://github.com/jonleighton/poltergeist.git |
| 44 | 27 | revision: 9645b52009e258921b860d3b7601d00008b22c45 |
| 45 | 28 | ref: 9645b52009e258921b860d3b7601d00008b22c45 |
| ... | ... | @@ -162,14 +145,13 @@ GEM |
| 162 | 145 | eventmachine (>= 0.12.0) |
| 163 | 146 | ffaker (1.15.0) |
| 164 | 147 | ffi (1.6.0) |
| 165 | - font-awesome-sass-rails (3.0.0.1) | |
| 148 | + font-awesome-sass-rails (3.0.2.2) | |
| 166 | 149 | railties (>= 3.1.1) |
| 167 | 150 | sass-rails (>= 3.1.1) |
| 168 | - foreman (0.61.0) | |
| 151 | + foreman (0.62.0) | |
| 169 | 152 | thor (>= 0.13.6) |
| 170 | 153 | gemoji (1.2.1) |
| 171 | 154 | gherkin-ruby (0.2.1) |
| 172 | - git (1.2.5) | |
| 173 | 155 | github-linguist (2.3.4) |
| 174 | 156 | charlock_holmes (~> 0.6.6) |
| 175 | 157 | escape_utils (~> 0.2.3) |
| ... | ... | @@ -188,6 +170,14 @@ GEM |
| 188 | 170 | omniauth (~> 1.0) |
| 189 | 171 | pyu-ruby-sasl (~> 0.0.3.1) |
| 190 | 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 | 181 | gon (4.0.2) |
| 192 | 182 | grape (0.3.2) |
| 193 | 183 | activesupport |
| ... | ... | @@ -264,7 +254,6 @@ GEM |
| 264 | 254 | multi_json (1.7.2) |
| 265 | 255 | multi_xml (0.5.3) |
| 266 | 256 | multipart-post (1.1.5) |
| 267 | - mustache (0.99.4) | |
| 268 | 257 | mysql2 (0.3.11) |
| 269 | 258 | net-ldap (0.2.2) |
| 270 | 259 | nokogiri (1.5.9) |
| ... | ... | @@ -318,7 +307,7 @@ GEM |
| 318 | 307 | rack (>= 1.1.3) |
| 319 | 308 | rack-mount (0.8.3) |
| 320 | 309 | rack (>= 1.0.0) |
| 321 | - rack-protection (1.4.0) | |
| 310 | + rack-protection (1.5.0) | |
| 322 | 311 | rack |
| 323 | 312 | rack-ssl (1.3.3) |
| 324 | 313 | rack |
| ... | ... | @@ -426,7 +415,7 @@ GEM |
| 426 | 415 | multi_json (~> 1.0) |
| 427 | 416 | simplecov-html (~> 0.7.1) |
| 428 | 417 | simplecov-html (0.7.1) |
| 429 | - sinatra (1.3.5) | |
| 418 | + sinatra (1.3.6) | |
| 430 | 419 | rack (~> 1.4) |
| 431 | 420 | rack-protection (~> 1.3) |
| 432 | 421 | tilt (~> 1.3, >= 1.3.3) |
| ... | ... | @@ -471,7 +460,6 @@ GEM |
| 471 | 460 | uglifier (1.3.0) |
| 472 | 461 | execjs (>= 0.3.0) |
| 473 | 462 | multi_json (~> 1.0, >= 1.0.2) |
| 474 | - useragent (0.4.16) | |
| 475 | 463 | virtus (0.5.4) |
| 476 | 464 | backports (~> 2.6.1) |
| 477 | 465 | descendants_tracker (~> 0.0.1) |
| ... | ... | @@ -509,14 +497,13 @@ DEPENDENCIES |
| 509 | 497 | font-awesome-sass-rails (~> 3.0.0) |
| 510 | 498 | foreman |
| 511 | 499 | gemoji (~> 1.2.1) |
| 512 | - git | |
| 513 | 500 | github-linguist (~> 2.3.4) |
| 514 | 501 | github-markup (~> 0.7.4) |
| 515 | 502 | gitlab-grack (~> 1.0.0) |
| 516 | 503 | gitlab-pygments.rb (~> 0.3.2) |
| 517 | 504 | gitlab_meta (= 5.0) |
| 518 | 505 | gitlab_omniauth-ldap (= 1.0.2) |
| 519 | - gollum (~> 2.4.0)! | |
| 506 | + gollum-lib (~> 1.0.0) | |
| 520 | 507 | gon |
| 521 | 508 | grape (~> 0.3.1) |
| 522 | 509 | grape-entity (~> 0.2.0) | ... | ... |