home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,302 Commits 48 Branches 340 Tags
4dc6dfdfe00cef7945350707dabef4a0eb8f113d
Commit Graph
636 Commits
Author SHA1 Message Date
Jacob Vosmaer 4dc6dfdfe0 Add assets:precompile to CE-to-EE update steps 2013-12-02 14:39:28 +01:00
Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 
Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-29 10:01:43 +02:00
Sairam KunalaandDmitriy Zaporozhets 232e6b40f6 minor fix to command 2013-11-23 21:38:58 +02:00
Achilleas Pipinellis 251c384a7c Update ruby to patchlevel 353 (security update) 
https://www.ruby-lang.org/en/news/2013/11/22/heap-overflow-in-floating-point-parsing-cve-2013-4164/
 2013-11-23 12:38:36 +02:00
Dmitriy Zaporozhets 35db034e61 Fix 6.3 branch name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-22 15:18:47 +02:00
Sytse Sijbrandij b5ea6aa11c Ensure customers know that GitLab.com supports RHEL. 2013-11-21 19:38:05 +01:00
Dmitriy Zaporozhets e3a718574c Update docs for 6.3 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 12:44:46 +02:00
Dmitriy Zaporozhets 7101b22c2e Recommend gitlab-shell 1.7.9 in docs and check task 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 12:34:14 +02:00
Dmitriy Zaporozhets a1d88f0fed Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-11-20 10:04:55 +02:00
Dmitriy Zaporozhets 3bab1bd4c1 Improve consistency: use file_path for API create/update/delete files 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 10:03:50 +02:00
Jacob Vosmaer faacfc91ed Merge pull request #5619 from taziyah/patch-1 
Fix diff command for gitlab.yml.example
 2013-11-19 23:52:03 -08:00
Sytse Sijbrandij 6413bfb5c6 Merge branch 'master' into full-post-to-oss-security 
Conflicts:
	doc/release/security.md
 2013-11-19 16:38:43 +01:00
Dmitriy Zaporozhets 32d7332d2c API: delete file from repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:33:38 +02:00
Tobias Millauer 8ddadc9971 Update 6.0-to-6.2.md 2013-11-18 19:22:39 +01:00
Dmitriy Zaporozhets 434d276dba better wording for api doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-18 19:53:10 +02:00
Sytse Sijbrandij 250a86d278 Also add CVE to changelog. 2013-11-18 17:45:28 +01:00
Sytse Sijbrandij 6cdd08965e Full post to OSS security. 2013-11-18 17:43:25 +01:00
Dmitriy Zaporozhets 11931bfb9c update projects api docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-18 16:49:29 +02:00
Sytse Sijbrandij 9be86adbbc Inform community of our timing. 2013-11-17 08:46:04 -05:00
Sytse Sijbrandij 580049c04b Separate procedures for both releases. 2013-11-14 13:40:05 -05:00
Jacob Vosmaer 36ae4c5589 Use gitlab-shell 1.7.8 for GitLab 6.x 2013-11-14 14:18:02 +01:00
Jacob Vosmaer 0ab0ca0d9d Use gitlab-shell 1.7.8 2013-11-14 13:35:45 +01:00
Dmitriy Zaporozhets c77d957b36 API: Edit file in repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-11 14:58:06 +02:00
Dmitriy Zaporozhets 79afb001ad Fix type in API doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-10 10:43:04 +02:00
Dmitriy Zaporozhets ca196453f0 Merge branch 'feature/api_create_file' of /home/git/repositories/gitlab/gitlabhq 2013-11-09 09:42:29 +00:00
Dmitriy Zaporozhets f64dd1b492 Add docs for create file API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-09 11:40:17 +02:00
Dmitriy Zaporozhets dfade97edf Merge branch 'contribution-license-agreement' of /home/git/repositories/gitlab/gitlabhq 2013-11-08 16:33:52 +00:00
Dmitriy Zaporozhets ce1efb56eb Merge branch 'ra_default' of /home/git/repositories/gitlab/gitlabhq 2013-11-08 16:19:40 +00:00
Jacob Vosmaer 7b0feec29d Add 6.2 CE to EE update docs 2013-11-08 16:45:47 +01:00
Marin Jankovski da238bbdf4 Remove separate installation of charlock_holmes. 2013-11-07 09:56:12 +01:00
Dmitriy Zaporozhets c28786ecbe Require gitlab-shell 1.7.6 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 21:52:37 +02:00
Dmitriy Zaporozhets cfa15d0846 Remove default_branch support from API project creation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 19:14:11 +02:00
Marin Jankovski 3c8c06751c Enable rack_attack by default. 2013-11-06 13:10:59 +01:00
Jacob Vosmaer ee2510e518 Update 6.2 update docs for EE 2013-11-05 18:20:05 +01:00
Sytse Sijbrandij c467ef5221 Number 3 was missing. 2013-11-04 11:36:07 -08:00
Dmitriy Zaporozhets 400a55805c Merge branch 'gitlab_shell_in_patch_doc' of /home/git/repositories/gitlab/gitlabhq 2013-11-04 19:30:26 +00:00
Jacob Vosmaer 27fe6cbe13 Include gitlab-shell in patch update doc 2013-11-04 20:28:07 +01:00
Dmitriy Zaporozhets 617cc8fb98 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2013-11-04 20:37:15 +02:00
Dmitriy Zaporozhets abf60c4c80 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq 2013-11-04 14:26:42 +02:00
Matěj Cepl aff447b4dd Fix name of RHEL 
The company is called Red Hat, and its flagship product is Red Hat Enterprise Linux (commonly abbreviated as RHEL). There is no such thing as RedHat (and never was).
 2013-11-04 10:08:13 +01:00
Jacob Vosmaer 7265b4068d Add security update info to 6.0-to-6.2.md 2013-11-02 17:32:14 +01:00
Jacob Vosmaer 81f69b5d31 Clarify upgrade steps 2013-11-02 17:24:43 +01:00
Jacob Vosmaer 5f0bb6cfa8 Add 5.1-to-5.4 update path 2013-11-02 17:13:38 +01:00
Jacob Vosmaer faa6a34a17 Bump gitlab-shell in 5.4 and 6.2 2013-11-02 17:05:06 +01:00
Jacob Vosmaer 88c15909f9 Add security warnings to update docs 2013-11-02 16:49:26 +01:00
Jacob Vosmaer 9e31555afb Use gitlab-shell 1.7.4 2013-11-01 16:38:55 +01:00
Jacob Vosmaer 867785b492 Use gitlab-shell 1.7.4 2013-11-01 16:34:00 +01:00
Dmitriy Zaporozhets b936314e6b Merge branch '6_0_to_6_2' of /home/git/repositories/gitlab/gitlabhq 2013-11-01 12:17:22 +00:00
Jacob Vosmaer fa6f198309 Bump gitlab-shell to 1.7.3 2013-11-01 13:05:26 +01:00
Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable 
Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb
 2013-10-31 14:29:48 +02:00