Commit f1cbf5c4ebdac7e1a8341aa2f881bc33f570d0a3
Exists in
master
and in
9 other branches
Merge branch 'python_docutils'
Showing
3 changed files
with
30 additions
and
0 deletions
Show diff stats
CHANGELOG
| @@ -9,6 +9,7 @@ | @@ -9,6 +9,7 @@ | ||
| 9 | - Support changing the 'signin_enabled' option (Konstantinos Paliouras) | 9 | - Support changing the 'signin_enabled' option (Konstantinos Paliouras) |
| 10 | - Fix Nginx HTTP-to-HTTPS log configuration error (Konstantinos Paliouras) | 10 | - Fix Nginx HTTP-to-HTTPS log configuration error (Konstantinos Paliouras) |
| 11 | - Create the authorized-keys.lock file for gitlab-shell 1.9.4 | 11 | - Create the authorized-keys.lock file for gitlab-shell 1.9.4 |
| 12 | +- Include Python and docutils for reStructuredText support | ||
| 12 | 13 | ||
| 13 | 6.9.? | 14 | 6.9.? |
| 14 | - Create the authorized-keys.lock file for gitlab-shell 1.9.4 | 15 | - Create the authorized-keys.lock file for gitlab-shell 1.9.4 |
config/software/gitlab-rails.rb
| @@ -29,6 +29,7 @@ dependency "curl" | @@ -29,6 +29,7 @@ dependency "curl" | ||
| 29 | dependency "rsync" | 29 | dependency "rsync" |
| 30 | dependency "libicu" | 30 | dependency "libicu" |
| 31 | dependency "postgresql" | 31 | dependency "postgresql" |
| 32 | +dependency "python-docutils" | ||
| 32 | dependency "mysql-client" if EE | 33 | dependency "mysql-client" if EE |
| 33 | 34 | ||
| 34 | source :git => "https://gitlab.com/gitlab-org/gitlab-ce.git" | 35 | source :git => "https://gitlab.com/gitlab-org/gitlab-ce.git" |
| @@ -0,0 +1,28 @@ | @@ -0,0 +1,28 @@ | ||
| 1 | +# | ||
| 2 | +## Copyright:: Copyright (c) 2014 GitLab.com | ||
| 3 | +## License:: Apache License, Version 2.0 | ||
| 4 | +## | ||
| 5 | +## Licensed under the Apache License, Version 2.0 (the "License"); | ||
| 6 | +## you may not use this file except in compliance with the License. | ||
| 7 | +## You may obtain a copy of the License at | ||
| 8 | +## | ||
| 9 | +## http://www.apache.org/licenses/LICENSE-2.0 | ||
| 10 | +## | ||
| 11 | +## Unless required by applicable law or agreed to in writing, software | ||
| 12 | +## distributed under the License is distributed on an "AS IS" BASIS, | ||
| 13 | +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| 14 | +## See the License for the specific language governing permissions and | ||
| 15 | +## limitations under the License. | ||
| 16 | +## | ||
| 17 | +# | ||
| 18 | + | ||
| 19 | +name "python-docutils" | ||
| 20 | + | ||
| 21 | +default_version "0.11" | ||
| 22 | + | ||
| 23 | +dependency "pip" | ||
| 24 | +dependency "python" | ||
| 25 | + | ||
| 26 | +build do | ||
| 27 | + command "#{install_dir}/embedded/bin/pip install docutils==#{version}" | ||
| 28 | +end |