Merge branch 'python_docutils'

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