home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 04:36:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,164 Commits 48 Branches 340 Tags
6-3-stable
Commit Graph
7164 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 779b4dccf1 Merge pull request #5795 from maltefiala/6-3-stable 
Added Rake:Attack cp information to Upgrade Guide 6.3.0
 2013-12-10 01:55:20 -08:00
maltefiala 0daf8813b7 Added Rake:Attack cp information to Upgrade Guide 6.3.0 2013-12-08 17:51:56 +01:00
Dmitriy Zaporozhets 09c6f663e9 Merge branch '6-3-1-stable' of /home/git/repositories/gitlab/gitlabhq into 6-3-stable v6.3.1 2013-12-05 15:17:30 +00:00
Jacob Vosmaer 92b8b9c41a Bump version to 6.3.1 2013-12-04 17:58:41 +01:00
Dmitriy ZaporozhetsandJacob Vosmaer d30c7db1c4 Update rails to 3.2.16 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 17:57:10 +01:00
Dmitriy Zaporozhets b56f85c04f Merge pull request #5702 from Wachiwi/patch-1 
Corrected Typo
 2013-11-27 04:14:58 -08:00
Wachiwi 2ae5c8ab9f Corrected Typo 2013-11-27 11:42:54 +01:00
Sairam KunalaandDmitriy Zaporozhets 232e6b40f6 minor fix to command 2013-11-23 21:38:58 +02:00
Dmitriy Zaporozhets 2d8bdf52bb Merge branch 'update_ruby_6_3_stable' of /home/git/repositories/gitlab/gitlabhq into 6-3-stable 2013-11-23 14:49:25 +00: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
Dmitriy Zaporozhets f285da48b1 Version to 6.3.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
v6.3.0 		2013-11-22 12:58:37 +02:00
Dmitriy Zaporozhets 51ae88c4e4 Improve refs parsing for git over http 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-22 12:55:20 +02:00
Dmitriy Zaporozhets 06feb3c442 Cleanup parsed refs for git over HTTP 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-22 12:41:55 +02:00
Dmitriy Zaporozhets 7f68598622 Merge pull request #5647 from lordjabez/develop 
Fix grammar in fork error message.
 2013-11-21 13:54:39 -08:00
Judson D Neer 574fffb722 Fix grammar in fork error message. 2013-11-21 11:53:48 -08:00
Dmitriy Zaporozhets 6b491a2bed Merge branch 'os-requirements' of /home/git/repositories/gitlab/gitlabhq 2013-11-21 19:02:45 +00:00
Dmitriy Zaporozhets 503280db11 Merge branch 'tests_limitation_skip' of /home/git/repositories/gitlab/gitlabhq 2013-11-21 18:39:57 +00:00
Sytse Sijbrandij b5ea6aa11c Ensure customers know that GitLab.com supports RHEL. 2013-11-21 19:38:05 +01:00
Marin Jankovski bb71c5d89f No limits when testing. 2013-11-21 16:04:23 +01:00
Dmitriy Zaporozhets 4525fc8405 Time for release candidate 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-21 10:03:00 +02:00
Dmitriy Zaporozhets fc3c57734d Style resend confirmation instructions 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-21 09:46:09 +02:00
Dmitriy Zaporozhets 7e4739fe22 Merge branch 'backup_commands' of /home/git/repositories/gitlab/gitlabhq 2013-11-21 07:45:37 +00:00
Dmitriy Zaporozhets fd6e51612e Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 19:27:49 +02:00
Dmitriy Zaporozhets 3bdf930852 Render markdown in snippets 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 17:29:50 +02:00
Dmitriy Zaporozhets 436e96467d Nicer icons for enabled/disabled stuff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 14:05:42 +02:00
Dmitriy Zaporozhets b07c02eb13 Add more info to admin dashboard 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 13:41:41 +02: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 8ddb064bbd Prefer user email match when looking for commit author 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 11:19:51 +02:00
Dmitriy Zaporozhets 893153113d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-11-20 11:07:46 +02:00
Dmitriy Zaporozhets 30912835e3 Correctly remove and re-create satellites when project transfer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 11:06:42 +02:00
Dmitriy Zaporozhets 182aa19e26 Parse all refs when do push via HTTP and check permissions for all of them 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 11:06:19 +02:00
Jacob Vosmaer 728f1d812f Merge pull request #5621 from archiloque/typo_in_gitlab.yml 
Typo in gitlab.yml.example
 2013-11-20 01:03:35 -08:00
Dmitriy Zaporozhets 3f3b202c6e Improve files API. Relative path check added. Create dir for new file if missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 10:21:45 +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
Dmitriy Zaporozhets 33eae33423 Merge branch 'full-post-to-oss-security' of /home/git/repositories/gitlab/gitlabhq 2013-11-19 17:04:05 +00: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 6cc3cc5152 Changelog entries and version up to beta1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 17:27:23 +02:00
Dmitriy Zaporozhets 9772cefc43 Merge branch 'feature/api_delete_file' of /home/git/repositories/gitlab/gitlabhq 2013-11-19 15:25:38 +00:00
Dmitriy Zaporozhets b0f300063e Merge branch 'feature/delete_file' of /home/git/repositories/gitlab/gitlabhq 2013-11-19 15:06:53 +00:00
Dmitriy Zaporozhets a185cce5d3 Tests for delete file by API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:36:11 +02: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
Dmitriy Zaporozhets bd20ec1a34 Remove file from repository feature 
After click on remove file button you will be asked for commit message
via modal window. After submitting modal form file will be removed from
repository

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:14:56 +02:00
Dmitriy Zaporozhets 4cac195a0e DeleteFile context 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:14:06 +02:00
Dmitriy Zaporozhets 8a91e5d7d0 Fix DeleteFile satellite action 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:13:37 +02:00
Dmitriy Zaporozhets b26abe8ff8 Delete file action for satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 15:41:32 +02:00
Dmitriy Zaporozhets 60959df3f2 Remove gitolite mention 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 15:41:11 +02:00