Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#29] update grit

This commit is contained in:
Alexander Machehin 2014-01-10 11:11:00 +06:00
parent 1bcb179e41
commit 90406d5000
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -25,8 +25,8 @@ gem 'state_machine'
gem 'redis-rails' gem 'redis-rails'
gem 'grack', :git => 'git://github.com/rosa-abf/grack.git', :require => 'git_http' gem 'grack', :git => 'git://github.com/rosa-abf/grack.git', :require => 'git_http'
gem "gitlab-grit", "~> 2.6.3" gem 'grit', :git => 'git://github.com/rosa-abf/grit.git'
gem 'charlock_holmes', '~> 0.6.9' #, :git => 'git://github.com/brianmario/charlock_holmes.git', :branch => 'bundle-icu' gem 'charlock_holmes', '~> 0.6.9'
gem 'github-linguist', '~> 2.3.4', :require => 'linguist' gem 'github-linguist', '~> 2.3.4', :require => 'linguist'
gem 'diff-display', '~> 0.0.1' gem 'diff-display', '~> 0.0.1'

22
Gemfile.lock
View File

@ -4,6 +4,15 @@ GIT
specs: specs:
grack (0.2.0) grack (0.2.0)
GIT
remote: git://github.com/rosa-abf/grit.git
revision: 9c4a318953709eebcf2e567f906c907068a268f8
specs:
grit (2.5.0)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3.6)
GIT GIT
remote: git://github.com/rosa-abf/redhillonrails_core.git remote: git://github.com/rosa-abf/redhillonrails_core.git
revision: c0945a4c6ad4bae4ca2750b105efcff162408b15 revision: c0945a4c6ad4bae4ca2750b105efcff162408b15
@ -131,11 +140,6 @@ GEM
pygments.rb (>= 0.2.13) pygments.rb (>= 0.2.13)
github-markdown (0.5.3) github-markdown (0.5.3)
github-markup (0.7.5) github-markup (0.7.5)
gitlab-grit (2.6.3)
charlock_holmes (~> 0.6.9)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3.6)
gli (2.8.1) gli (2.8.1)
gollum (2.1.10) gollum (2.1.10)
github-markdown github-markdown
@ -149,10 +153,6 @@ GEM
sinatra (~> 1.0) sinatra (~> 1.0)
stringex (~> 1.4.0) stringex (~> 1.4.0)
useragent (~> 0.4.9) useragent (~> 0.4.9)
grit (2.5.0)
diff-lcs (~> 1.1)
mime-types (~> 1.15)
posix-spawn (~> 0.3.6)
haml (3.1.8) haml (3.1.8)
haml-rails (0.3.5) haml-rails (0.3.5)
actionpack (>= 3.1, < 4.1) actionpack (>= 3.1, < 4.1)
@ -267,7 +267,7 @@ GEM
resque resque
pg (0.14.1) pg (0.14.1)
polyglot (0.3.3) polyglot (0.3.3)
posix-spawn (0.3.6) posix-spawn (0.3.8)
puma (2.7.1) puma (2.7.1)
rack (>= 1.1, < 2.0) rack (>= 1.1, < 2.0)
pygments.rb (0.2.13) pygments.rb (0.2.13)
@ -466,9 +466,9 @@ DEPENDENCIES
friendly_id friendly_id
gemoji (~> 1.2.1) gemoji (~> 1.2.1)
github-linguist (~> 2.3.4) github-linguist (~> 2.3.4)
gitlab-grit (~> 2.6.3)
gollum (~> 2.1.3) gollum (~> 2.1.3)
grack! grack!
grit!
haml-rails (~> 0.3.4) haml-rails (~> 0.3.4)
highline (~> 1.6.11) highline (~> 1.6.11)
hirb hirb