home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,672 Commits 48 Branches 340 Tags
d938486c3607dde357bf10f2d31b204290cdfd3f
Commit Graph
5672 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Yves Senn a8b544ed77 Merge pull request #4519 from kwongius/team-assignment-text 
Fix header text for setting greatest team access to a project
 2013-07-09 11:21:18 -07:00
Kevin Wong 1da67c2cec Fix header text for setting greatest team access to a project 2013-07-09 10:42:35 -06:00
Angus MacArthur ea5a006f27 Additon of apis for fork administration. 
Added ability to add and remove the forked from/to relatioinship
between existing repos.
 2013-07-08 17:34:00 -04:00
Dmitriy Zaporozhets e1ac3db927 Merge branch 'change-to-default-installer' of /home/git/repositories/gitlab/gitlabhq 2013-07-08 17:36:21 +00:00
Sytse Sijbrandij de680eb8c0 Use default system editor. 2013-07-08 18:52:10 +02:00
Dmitriy Zaporozhets 7ebbb6e33f Added new entries to changelog. Version up to 5.4.0.pre 2013-07-08 13:59:56 +03:00
Dmitriy Zaporozhets 9ee86156db Merge pull request #4508 from Razer6/fix_broken_api_links 
Fix broken API links, fixes #4463
 2013-07-08 03:22:12 -07:00
Dmitriy Zaporozhets 6f5f5e7ee3 Add suppoort of unicorn and fog gems 2013-07-08 09:47:31 +03:00
Dmitriy Zaporozhets cefd8fe2fa Merge branch 'rename-support-forum-to-mailing-list' of /home/git/repositories/gitlab/gitlabhq 2013-07-08 06:29:14 +00:00
Dmitriy Zaporozhets e72900d8e3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-07-08 00:22:21 +03:00
Martin Bastien 9f2e1b33a4 navbar tooltip position fix when "loading" appears. 2013-07-07 13:30:29 -04:00
Robert Schilling db325ef940 Fix Pygments 500 error if lexer not found by name. Use first alias instead. fixes #4473, #4451 2013-07-07 19:00:07 +02:00
Yves Senn c04e973327 Merge pull request #4509 from bbodenmiller/cont-updates 
minor contributing guide updates
 2013-07-07 04:49:28 -07:00
Ben Bodenmiller b686b4b962 minor contributing guide updates 
* issues & pr in English
* appropriate language
* typo & format fix
* not catch all pull request
* update changelog
 2013-07-07 04:46:37 -07:00
Robert Schilling 4de11c2009 Fix broken API links, fixes #4463 2013-07-07 12:35:37 +02:00
Sytse Sijbrandij c64ee6ac33 Rename support forum to mailing list to prevent duplication on community page of GitLab.org. 2013-07-07 11:30:31 +02:00
Dmitriy Zaporozhets 5315fd5a59 Merge pull request #4505 from m4tthumphrey/patch-1 
Added client list to API doc
 2013-07-06 02:38:04 -07:00
Matt Humphrey 4bba945437 Added client list to API doc 2013-07-06 10:14:06 +01:00
wuweixin 2c7b0d5a46 fix bug when project named: mediawiki 
mediawiki.wiki.git
mediawiki.git

/.wiki$/ match awiki, so when your project named mediawiki
it will be find project named: "medi"

use /\.wiki$/ fix this bug
 2013-07-06 09:31:56 +08:00
Yves Senn cab2ba0af3 Merge pull request #4476 from tstone2077/master 
Updating documentation to reflect #3836 (resolving #4443)
 2013-07-04 04:28:53 -07:00
Dmitriy Zaporozhets d0f3e993c5 Merge branch 'puma_cluster_recommendation' of /home/git/repositories/gitlab/gitlabhq 2013-07-04 11:08:33 +00:00
Jacob Vosmaer ae9e4a52c5 Add cluster mode instructions to puma.rb.example 2013-07-04 11:14:03 +02:00
Dmitriy Zaporozhets 2233f2e020 Merge pull request #4484 from Razer6/add_services_to_blacklist 
Add 'services' to path blacklist
 2013-07-03 12:03:39 -07:00
Yves Senn 3edca5d822 Merge pull request #4488 from dekimsey/patch-1 
Fix misspelling in social accounts tip
 2013-07-03 10:43:50 -07:00
dekimsey b8f51acf7b Fix misspelling in social accounts tip 2013-07-03 13:34:23 -04:00
Robert Schilling 702dc30448 Add 'services' to path blacklist, fixes #4470 2013-07-03 12:57:35 +02:00
Yves Senn d6ab5ad306 Merge pull request #4482 from kivlor/patch-1 
move 'make config/database.yml readable to git only' instruction
 2013-07-03 00:00:14 -07:00
Andrew Gallagher 0c4fd05d72 move 'make config/database.yml readable to git only' instruction 
I've moved the instruction in question to the the 
'Configure GitLab DB settings'. Can't change permission to a file that doesn't already exist 😉
 2013-07-03 15:15:50 +10:00
Dmitriy Zaporozhets 7588186e81 Merge branch 'warning_relative_url' of /home/git/repositories/gitlab/gitlabhq 2013-07-02 08:43:40 +00:00
Dmitriy Zaporozhets 66e10f0566 Fix header avatar 2013-07-02 11:42:39 +03:00
Dmitriy Zaporozhets 47f78a2c76 Merge pull request #4440 from jackbot/editable-notes 
Editable notes
 2013-07-02 01:41:28 -07:00