home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,703 Commits 48 Branches 340 Tags
5-4-stable
Commit Graph
5703 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Vosmaer cac03f748c Merge branch '5-4-stable' of github.com:gitlabhq/gitlabhq into 5-4-stable 2014-01-16 18:55:59 +01:00
Dmitriy Zaporozhets fc780d11e5 Merge pull request #4786 from terrywang/issue-4785 
Fix issue 4785 - missing gitlab-shell part in 5.3 to 5.4 update guide
 2013-12-22 00:55:54 -08:00
Jacob Vosmaer 147a1035ab Monkey patch for CVE-2013-6414 2013-12-04 17:39:19 +01:00
Dmitriy Zaporozhets 2d65430cd7 Merge branch 'api_token_cast_5_4' of /home/git/repositories/gitlab/gitlabhq into 5-4-stable v5.4.2 2013-11-14 15:39:15 +00:00
Jacob Vosmaer 671cdc5c5f Use gitlab-shell 1.7.8 2013-11-14 13:59:41 +01:00
Jacob Vosmaer aa81c10040 Bump version 2013-11-14 13:21:25 +01:00
Jacob Vosmaer 1a115cecb4 Make sure private_token for API is a string 2013-11-14 13:20:49 +01:00
Dmitriy Zaporozhets 36dc6e6b51 Merge branch '5-4-security-update' of /home/git/repositories/gitlab/gitlabhq into 5-4-stable v5.4.1 2013-11-04 13:01:03 +00:00
Dmitriy Zaporozhets b40ff1e06e Add db:setup to rake gitlab:test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-04 14:21:12 +02:00
Jacob Vosmaer 7b0f72d38e Bump version to 5.4.1 2013-11-04 12:54:06 +01:00
Jacob Vosmaer ac5d5adeb8 Bump gitlab-shell to 1.7.4 (CVE-2013-4490) 2013-11-04 12:52:53 +01:00
Dmitriy ZaporozhetsandJacob Vosmaer 6d8b0bbb96 Correctly escape search query 2013-11-04 12:01:55 +01:00
Dmitriy ZaporozhetsandJacob Vosmaer 8a5bf011ab Shell escape code search 2013-11-04 12:01:54 +01:00
Jacob Vosmaer 6c067380fc Update gitlab_git (CVE-2013-4489) 2013-11-04 11:57:55 +01:00
Sytse SijbrandijandJacob Vosmaer 38cf6281a7 Fix for Resque forking might cause stuck workers for the threaded Sidekiq. 2013-09-25 14:35:51 +02:00
Dmitriy Zaporozhets 9360c7334a Merge branch 'celluloid_update' of /home/git/repositories/gitlab/gitlabhq into 5-4-stable 2013-08-27 20:57:12 +00:00
Izaak AlpertandJacob Vosmaer 56a83cdff6 Updated sidekiq Gemfile.lock for celluloid error 
Should (hopefully fix issue with: "Mysql2::Error: This connection is still waiting for a result, try again once you have the result:"

https://github.com/mperham/sidekiq/pull/954
https://github.com/celluloid/celluloid/pull/268

Change-Id: I4daa65b6b6f9de20975d95ba07ffab103ec03204
 2013-08-27 17:55:32 +02:00
Jacob Vosmaer aed4e0f0e0 Merge pull request #4801 from Rovanion/patch-3 
Don't restart nginx, just tell it to reload it's config files.
 2013-08-19 02:08:12 -07:00
Rovanion Luckey a906860e9e Don't restart nginx, just tell it to reload it's config files. 2013-08-17 15:26:50 +02:00
Terry Wang 29b362d063 Fix issue 4785 - missing gitlab-shell part in update guide 2013-08-15 17:25:11 +10:00
Dmitriy Zaporozhets e8d77e21fb Merge pull request #4611 from axilleas/bump-gitlab-shell-version_5-4 
Bump version of gitlab-shell to 1.7.0
 2013-08-04 02:44:24 -07:00
Axilleas Pipinellis eab6ce0388 Bump version of gitlab-shell to 1.5.0 and fix gitlab version typo 2013-08-03 12:59:12 +03:00
Jacob Vosmaer 94a814d3ac Update references to 5-3-stable in install guide v5.4.0 2013-07-22 10:50:36 +02:00
Dmitriy Zaporozhets a5a7555c1d Update VERSION to 5.4.0 2013-07-19 12:27:09 +00:00
Dmitriy Zaporozhets 5487db6ebe Merge pull request #4589 from lukas2511/patch-1 
Update installation.md
 2013-07-18 11:27:30 -07:00
Lukas Schauer 7a165d2056 Update installation.md 
fixed branch-name (5-3 -> 5-4)
 2013-07-18 18:52:24 +02:00
Dmitriy Zaporozhets f24c6e8353 Doc for update from 5.3 to 5.4 2013-07-18 19:32:39 +03:00
Dmitriy Zaporozhets f1fc1ae6f1 5.4.0 is rc1 2013-07-12 16:12:23 +03:00
Dmitriy Zaporozhets e68b0cac3d Update CHANGELOG 2013-07-12 16:11:45 +03:00
Dmitriy Zaporozhets 94149f8e7a Merge pull request #4324 from axilleas/initd_script 
Removal of gitlab.socket should be in stop function too. Fix #4313
 2013-07-12 05:45:22 -07:00
Dmitriy Zaporozhets d938486c36 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-07-12 14:40:47 +03:00
Dmitriy Zaporozhets dfc8281162 Fix issues 500 if milestone id exists but milestone is not 2013-07-12 14:40:27 +03:00
Yves Senn 02d174e964 Merge pull request #4533 from babatakao/patch-2 
Fix typo.
 2013-07-12 02:49:07 -07:00
Axilleas Pipinellis ec38d6290c Removal of gitlab.socket should be in stop function too. Fix #4313 2013-07-12 11:48:57 +03:00
Takao Baba 7bed77858c Fix typo. 2013-07-12 17:44:57 +09:00
Dmitriy Zaporozhets 8cdfa86b57 Merge pull request #3993 from bke-drewb/3599 
Issue 3599: Add snippets_enabled flag to projects for API
 2013-07-11 09:54:15 -07:00
Dmitriy Zaporozhets 7740005b76 Merge pull request #4264 from andrewwutw/fix-postgresql-restore 
Fix PostgreSQL database restoration problem (#4217)
 2013-07-11 09:52:43 -07:00
Dmitriy Zaporozhets 2a7ae176c1 Merge pull request #4282 from bke-drewb/3904 
Increase snippet content column size.
 2013-07-11 09:50:21 -07:00
Dmitriy Zaporozhets 11703e8ece Merge pull request #4297 from jdurand/patch-1 
Update api.js.coffee
 2013-07-11 09:39:37 -07:00
Dmitriy Zaporozhets c1d43ed78f Merge pull request #4353 from dirker/allow-import-via-git-protocol 
project: allow import via git:// url
 2013-07-11 09:24:19 -07:00
Dmitriy Zaporozhets 79a989fa0f Merge pull request #4398 from Razer6/remove_gitolite_check 
Remove gitolite repo check for import script
 2013-07-11 09:23:21 -07:00
Dmitriy Zaporozhets 1de30b9120 Merge pull request #4502 from wuwx/patch-1 
fix bug when project named: mediawiki
 2013-07-11 09:21:53 -07:00
Dmitriy Zaporozhets 17a4f11e9f Merge pull request #4528 from akiva/master 
Allow SSH keys to be of type ecdsa rather than only rsa and dsa (which are slower, older, and weaker)
 2013-07-11 09:20:46 -07:00
Akiva Levy 88301d5695 Allow ecdsa SSH keys 
Update app/models/key.rb to permit SSH keys of type ecdsa rather than forcing dsa and rsa algorithms.
 2013-07-10 15:19:52 -07:00
Dmitriy Zaporozhets 0d285c1cb1 Remove randomly failing test 2013-07-10 19:11:07 +03:00
Dmitriy Zaporozhets 381638b77f Merge pull request #4510 from Razer6/fix_not_found_lexers 
Fix Pygments 500 error if lexer not found by name
 2013-07-10 03:58:41 -07:00
Dmitriy Zaporozhets 10491ce082 Merge pull request #4511 from yuters/patch-3 
UI : navbar tooltip position fix when "loading" appears.
 2013-07-10 03:56:51 -07:00
Dmitriy Zaporozhets 90d497056f Merge pull request #4515 from amacarthur/fork-admin 
Additon of apis for fork administration.
 2013-07-10 03:54:58 -07:00
Dmitriy Zaporozhets d2d566b162 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-07-10 13:49:29 +03:00
Dmitriy Zaporozhets 8dd6af1466 Sanitize user attrs on model level 2013-07-10 13:48:50 +03:00