home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,850 Commits 48 Branches 340 Tags
de5c8601eb8df5e4a20b9fbb8a095ca87f3427be
Commit Graph
5850 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin Bastien de5c8601eb Fix invalid task name migrate_global_keys 2013-07-12 21:37:05 -04:00
Dmitriy Zaporozhets 8b1d44f789 Reduce top margin for commit show page box 2013-07-12 21:56:03 +03:00
Dmitriy Zaporozhets 3b660be6ee REmove duplicating search on dashboard issues/mr 2013-07-12 21:49:03 +03:00
Dmitriy Zaporozhets 7406494abc Fix Help#web_hooks page 2013-07-12 21:23:56 +03:00
Dmitriy Zaporozhets dbf4e5b0b0 Reduce padding for dashboard elements 2013-07-12 19:15:49 +03:00
Dmitriy Zaporozhets dc038a7108 Rename Group#people to Group#members 2013-07-12 19:01:39 +03:00
Dmitriy Zaporozhets 3232f547ac Add group button at Profile#groups page 2013-07-12 18:29:39 +03:00
Dmitriy Zaporozhets acb402a1c1 Ability to leave group from profile area 2013-07-12 18:22:03 +03:00
Dmitriy Zaporozhets 7a42decec7 Update schema with snippet content size 2013-07-12 16:18:43 +03:00
Dmitriy Zaporozhets c43b289612 Merge branch '6-0-dev' of /home/git/repositories/gitlab/gitlabhq 2013-07-12 13:17:25 +00:00
Dmitriy Zaporozhets 92ef845fa5 Merge branch 'master' into 6-0-dev 
Conflicts:
	VERSION
 2013-07-12 16:16:20 +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 5181816970 Merge branch 'master' into 6-0-dev 2013-07-12 14:42:35 +03: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
Dmitriy Zaporozhets e49ec46461 Open note image attachment in new tab 2013-07-11 09:19:19 +03: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 4da48868e5 Fix multiple trigger on button attachment 2013-07-10 19:29:54 +03:00
Dmitriy Zaporozhets 0d285c1cb1 Remove randomly failing test 2013-07-10 19:11:07 +03:00
Dmitriy Zaporozhets 7ab2130cab Remove randomly failing test 2013-07-10 19:09:48 +03:00
Dmitriy Zaporozhets 6a9aed1e87 Merge branch 'master' into 6-0-dev 
Conflicts:
	CHANGELOG
	VERSION
	app/views/admin/teams/projects/new.html.haml
	app/views/projects/teams/available.html.haml
	doc/install/installation.md
 2013-07-10 14:03:00 +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
Dmitriy Zaporozhets 223d264051 Sanitize user attrs on model level 2013-07-10 13:48:03 +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
Dmitriy Zaporozhets 3dcc441916 Cleaner dashboard sidebar 2013-07-09 20:52:06 +03:00
Dmitriy Zaporozhets 03586c6c79 Fix User#can_create_project? 2013-07-09 20:51:49 +03:00
Kevin Wong 1da67c2cec Fix header text for setting greatest team access to a project 2013-07-09 10:42:35 -06:00
Dmitriy Zaporozhets b8c3f9a628 Extend shortcuts list modal. Mention it at help page 2013-07-09 18:34:44 +03:00
Dmitriy Zaporozhets f63cd42bab Better control placement on project page 2013-07-09 17:44:35 +03:00
Dmitriy Zaporozhets 5baac66992 More info (like 10 branches, 5 tags) at project show page 2013-07-09 10:44:47 +03: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
Dmitriy Zaporozhets 63e532eff0 Cache MR diffs result. Improve diff output 2013-07-08 20:12:35 +03:00