Commit 39754348 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'remove_pygments' into 'master'

Remove Pygments.rb
parents 0ee296d1 c75ab4ec
...@@ -29,7 +29,7 @@ gem 'omniauth-github' ...@@ -29,7 +29,7 @@ gem 'omniauth-github'
# Extracting information from a git repository # Extracting information from a git repository
# Provide access to Gitlab::Git library # Provide access to Gitlab::Git library
gem "gitlab_git", "~> 4.0.0" gem "gitlab_git", "~> 4.1.0"
# Ruby/Rack Git Smart-HTTP Server Handler # Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
...@@ -37,14 +37,11 @@ gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' ...@@ -37,14 +37,11 @@ gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
# LDAP Auth # LDAP Auth
gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap" gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap"
# Syntax highlighter
gem "gitlab-pygments.rb", '~> 0.5.4', require: 'pygments.rb'
# Git Wiki # Git Wiki
gem "gitlab-gollum-lib", "~> 1.0.2", require: 'gollum-lib' gem "gitlab-gollum-lib", "~> 1.1.0", require: 'gollum-lib'
# Language detection # Language detection
gem "gitlab-linguist", "~> 2.9.6", require: "linguist" gem "gitlab-linguist", "~> 2.9.6", require: "linguist", git: 'https://gitlab.com/gitlab-org/linguist.git', ref: 'b337f7013333863503a8a7894cceb568478fda66'
# API # API
gem "grape", "~> 0.6.1" gem "grape", "~> 0.6.1"
......
...@@ -5,6 +5,16 @@ GIT ...@@ -5,6 +5,16 @@ GIT
specs: specs:
github-markup (0.7.6) github-markup (0.7.6)
GIT
remote: https://gitlab.com/gitlab-org/linguist.git
revision: b337f7013333863503a8a7894cceb568478fda66
ref: b337f7013333863503a8a7894cceb568478fda66
specs:
gitlab-linguist (2.9.6)
charlock_holmes (~> 0.6.6)
escape_utils (~> 0.2.4)
mime-types (~> 1.19)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
...@@ -158,11 +168,10 @@ GEM ...@@ -158,11 +168,10 @@ GEM
gitlab-flowdock-git-hook (0.4.2.2) gitlab-flowdock-git-hook (0.4.2.2)
gitlab-grit (>= 2.4.1) gitlab-grit (>= 2.4.1)
multi_json multi_json
gitlab-gollum-lib (1.0.2) gitlab-gollum-lib (1.1.0)
github-markdown (~> 0.5.3) github-markdown (~> 0.5.3)
github-markup (>= 0.7.5, < 1.0.0) github-markup (>= 0.7.5, < 1.0.0)
gitlab-grit (~> 2.6.1) gitlab-grit (~> 2.6.1)
gitlab-pygments.rb (~> 0.5.4)
nokogiri (~> 1.5.9) nokogiri (~> 1.5.9)
sanitize (~> 2.0.3) sanitize (~> 2.0.3)
stringex (~> 1.5.1) stringex (~> 1.5.1)
...@@ -173,19 +182,10 @@ GEM ...@@ -173,19 +182,10 @@ GEM
diff-lcs (~> 1.1) diff-lcs (~> 1.1)
mime-types (~> 1.15) mime-types (~> 1.15)
posix-spawn (~> 0.3.6) posix-spawn (~> 0.3.6)
gitlab-linguist (2.9.6) gitlab_git (4.1.0)
charlock_holmes (~> 0.6.6)
escape_utils (~> 0.2.4)
gitlab-pygments.rb (~> 0.5.4)
mime-types (~> 1.19)
gitlab-pygments.rb (0.5.4)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
gitlab_git (4.0.0)
activesupport (~> 4.0.0) activesupport (~> 4.0.0)
gitlab-grit (~> 2.6.1) gitlab-grit (~> 2.6.1)
gitlab-linguist (~> 2.9.5) gitlab-linguist (~> 2.9.5)
gitlab-pygments.rb (~> 0.5.4)
gitlab_meta (6.0) gitlab_meta (6.0)
gitlab_omniauth-ldap (1.0.3) gitlab_omniauth-ldap (1.0.3)
net-ldap (~> 0.3.1) net-ldap (~> 0.3.1)
...@@ -543,7 +543,6 @@ GEM ...@@ -543,7 +543,6 @@ GEM
websocket-driver (0.3.1) websocket-driver (0.3.1)
xpath (2.0.0) xpath (2.0.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
yajl-ruby (1.1.0)
PLATFORMS PLATFORMS
ruby ruby
...@@ -578,11 +577,10 @@ DEPENDENCIES ...@@ -578,11 +577,10 @@ DEPENDENCIES
gemoji (~> 1.3.0) gemoji (~> 1.3.0)
github-markup (~> 0.7.4)! github-markup (~> 0.7.4)!
gitlab-flowdock-git-hook (~> 0.4.2) gitlab-flowdock-git-hook (~> 0.4.2)
gitlab-gollum-lib (~> 1.0.2) gitlab-gollum-lib (~> 1.1.0)
gitlab-grack (~> 2.0.0.pre) gitlab-grack (~> 2.0.0.pre)
gitlab-linguist (~> 2.9.6) gitlab-linguist (~> 2.9.6)!
gitlab-pygments.rb (~> 0.5.4) gitlab_git (~> 4.1.0)
gitlab_git (~> 4.0.0)
gitlab_meta (= 6.0) gitlab_meta (= 6.0)
gitlab_omniauth-ldap (= 1.0.3) gitlab_omniauth-ldap (= 1.0.3)
gon (~> 5.0.0) gon (~> 5.0.0)
......
require 'grit' require 'grit'
require 'pygments'
Grit::Git.git_binary = Gitlab.config.git.bin_path Grit::Git.git_binary = Gitlab.config.git.bin_path
Grit::Git.git_timeout = Gitlab.config.git.timeout Grit::Git.git_timeout = Gitlab.config.git.timeout
......
...@@ -56,23 +56,6 @@ Install the required packages: ...@@ -56,23 +56,6 @@ Install the required packages:
sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate
Make sure you have the right version of Python installed.
# Install Python
sudo apt-get install -y python
# Make sure that Python is 2.5+ (3.x is not supported at the moment)
python --version
# If it's Python 3 you might need to install Python 2 separately
sudo apt-get install -y python2.7
# Make sure you can access Python via python2
python2 --version
# If you get a "command not found" error create a link to the python binary
sudo ln -s /usr/bin/python /usr/bin/python2
# For reStructuredText markup language support install required package: # For reStructuredText markup language support install required package:
sudo apt-get install -y python-docutils sudo apt-get install -y python-docutils
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment