Download as
Browse Code »

Commit 397543480298ed24e5f9656e8f7b8142f8b54f0f

Authored by Dmitriy Zaporozhets
2 parents 0ee296d1 c75ab4ec
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'remove_pygments' into 'master' 

Remove Pygments.rb
Showing 4 changed files with 18 additions and 41 deletions   Show diff stats
Gemfile
  Diff comments   View file @3975434
... ... @@ -29,7 +29,7 @@ gem 'omniauth-github'
29 29  
30 30 # Extracting information from a git repository
31 31 # Provide access to Gitlab::Git library
32   -gem "gitlab_git", "~> 4.0.0"
  32 +gem "gitlab_git", "~> 4.1.0"
33 33  
34 34 # Ruby/Rack Git Smart-HTTP Server Handler
35 35 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
... ... @@ -37,14 +37,11 @@ gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
37 37 # LDAP Auth
38 38 gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap"
39 39  
40   -# Syntax highlighter
41   -gem "gitlab-pygments.rb", '~> 0.5.4', require: 'pygments.rb'
42   -
43 40 # Git Wiki
44   -gem "gitlab-gollum-lib", "~> 1.0.2", require: 'gollum-lib'
  41 +gem "gitlab-gollum-lib", "~> 1.1.0", require: 'gollum-lib'
45 42  
46 43 # Language detection
47   -gem "gitlab-linguist", "~> 2.9.6", require: "linguist"
  44 +gem "gitlab-linguist", "~> 2.9.6", require: "linguist", git: 'https://gitlab.com/gitlab-org/linguist.git', ref: 'b337f7013333863503a8a7894cceb568478fda66'
48 45  
49 46 # API
50 47 gem "grape", "~> 0.6.1"
... ...
Gemfile.lock
  Diff comments   View file @3975434
... ... @@ -5,6 +5,16 @@ GIT
5 5 specs:
6 6 github-markup (0.7.6)
7 7  
  8 +GIT
  9 + remote: https://gitlab.com/gitlab-org/linguist.git
  10 + revision: b337f7013333863503a8a7894cceb568478fda66
  11 + ref: b337f7013333863503a8a7894cceb568478fda66
  12 + specs:
  13 + gitlab-linguist (2.9.6)
  14 + charlock_holmes (~> 0.6.6)
  15 + escape_utils (~> 0.2.4)
  16 + mime-types (~> 1.19)
  17 +
8 18 GEM
9 19 remote: https://rubygems.org/
10 20 specs:
... ... @@ -158,11 +168,10 @@ GEM
158 168 gitlab-flowdock-git-hook (0.4.2.2)
159 169 gitlab-grit (>= 2.4.1)
160 170 multi_json
161   - gitlab-gollum-lib (1.0.2)
  171 + gitlab-gollum-lib (1.1.0)
162 172 github-markdown (~> 0.5.3)
163 173 github-markup (>= 0.7.5, < 1.0.0)
164 174 gitlab-grit (~> 2.6.1)
165   - gitlab-pygments.rb (~> 0.5.4)
166 175 nokogiri (~> 1.5.9)
167 176 sanitize (~> 2.0.3)
168 177 stringex (~> 1.5.1)
... ... @@ -173,19 +182,10 @@ GEM
173 182 diff-lcs (~> 1.1)
174 183 mime-types (~> 1.15)
175 184 posix-spawn (~> 0.3.6)
176   - gitlab-linguist (2.9.6)
177   - charlock_holmes (~> 0.6.6)
178   - escape_utils (~> 0.2.4)
179   - gitlab-pygments.rb (~> 0.5.4)
180   - mime-types (~> 1.19)
181   - gitlab-pygments.rb (0.5.4)
182   - posix-spawn (~> 0.3.6)
183   - yajl-ruby (~> 1.1.0)
184   - gitlab_git (4.0.0)
  185 + gitlab_git (4.1.0)
185 186 activesupport (~> 4.0.0)
186 187 gitlab-grit (~> 2.6.1)
187 188 gitlab-linguist (~> 2.9.5)
188   - gitlab-pygments.rb (~> 0.5.4)
189 189 gitlab_meta (6.0)
190 190 gitlab_omniauth-ldap (1.0.3)
191 191 net-ldap (~> 0.3.1)
... ... @@ -543,7 +543,6 @@ GEM
543 543 websocket-driver (0.3.1)
544 544 xpath (2.0.0)
545 545 nokogiri (~> 1.3)
546   - yajl-ruby (1.1.0)
547 546  
548 547 PLATFORMS
549 548 ruby
... ... @@ -578,11 +577,10 @@ DEPENDENCIES
578 577 gemoji (~> 1.3.0)
579 578 github-markup (~> 0.7.4)!
580 579 gitlab-flowdock-git-hook (~> 0.4.2)
581   - gitlab-gollum-lib (~> 1.0.2)
  580 + gitlab-gollum-lib (~> 1.1.0)
582 581 gitlab-grack (~> 2.0.0.pre)
583   - gitlab-linguist (~> 2.9.6)
584   - gitlab-pygments.rb (~> 0.5.4)
585   - gitlab_git (~> 4.0.0)
  582 + gitlab-linguist (~> 2.9.6)!
  583 + gitlab_git (~> 4.1.0)
586 584 gitlab_meta (= 6.0)
587 585 gitlab_omniauth-ldap (= 1.0.3)
588 586 gon (~> 5.0.0)
... ...
config/initializers/3_grit_ext.rb
  Diff comments   View file @3975434
1 1 require 'grit'
2   -require 'pygments'
3 2  
4 3 Grit::Git.git_binary = Gitlab.config.git.bin_path
5 4 Grit::Git.git_timeout = Gitlab.config.git.timeout
... ...
doc/install/installation.md
  Diff comments   View file @3975434
... ... @@ -56,23 +56,6 @@ Install the required packages:
56 56  
57 57 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
58 58  
59   -Make sure you have the right version of Python installed.
60   -
61   - # Install Python
62   - sudo apt-get install -y python
63   -
64   - # Make sure that Python is 2.5+ (3.x is not supported at the moment)
65   - python --version
66   -
67   - # If it's Python 3 you might need to install Python 2 separately
68   - sudo apt-get install -y python2.7
69   -
70   - # Make sure you can access Python via python2
71   - python2 --version
72   -
73   - # If you get a "command not found" error create a link to the python binary
74   - sudo ln -s /usr/bin/python /usr/bin/python2
75   -
76 59 # For reStructuredText markup language support install required package:
77 60 sudo apt-get install -y python-docutils
78 61  
... ...