home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,574 Commits 48 Branches 340 Tags
fb71426cdbda99e83b3bcfdcd2c8cf50d7e7c9e0
Commit Graph
6574 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets fb71426cdb Merge branch 'improve/gems_update' of /home/git/repositories/gitlab/gitlabhq 2013-09-29 13:51:04 +00:00
Dmitriy Zaporozhets 726fa6c76a Respect authorization in Repository API 
* dont allow protect/unprotect branches for users without master permissions
* dont allow access to Repository api for guests
 2013-09-29 16:04:57 +03:00
Dmitriy Zaporozhets bfb607a073 Update some development dependencies 2013-09-29 15:44:49 +03:00
Dmitriy Zaporozhets 1df225bb38 Merge pull request #3006 from jweslley/master 
add rake tasks for web hooks management
 2013-09-29 05:24:11 -07:00
DenixandJacob Vosmaer cbb5b000c0 Update databases.md 
run mysql_secure_installation to secure the freshly installed mysql server
 2013-09-27 16:32:09 +02:00
Jacob Vosmaer 883cb467c5 Merge pull request #5191 from jojosch/fix-check-script-sidekiq 
[gitlab:check] Fix detecting the status of sidekiq
 2013-09-27 07:22:18 -07:00
Johannes Schleifenbaum b5d7bcb784 [gitlab:check] Fix detecting the status of sidekiq 
If you are running another sidekiq instance on your server, e.g. GitLab
CI, the check script would parse the output of `ps aux` searching for
`sidekiq` and returning success, although the GitLab sidekiq may not be
running.

Now the `ps` call will only print the processes run by the GitLab user.
 2013-09-27 16:06:06 +02:00
Dmitriy Zaporozhets 72dd8011a7 rewrite issues search test to prevent ajax requests running after test 2013-09-27 16:25:24 +03:00
Dmitriy Zaporozhets 13e073e45b Merge branch 'only_one_sidekiq' of /home/git/repositories/gitlab/gitlabhq 2013-09-27 12:03:37 +00:00
Jacob Vosmaer 1a9b0df767 Check whether only one sidekiq is running 2013-09-27 12:57:05 +02:00
Dmitriy Zaporozhets 052a7cc9cd Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
 2013-09-26 22:19:01 +03:00
Dmitriy Zaporozhets 9bb1e15c83 Merge pull request #5192 from zshannon/patch-1 
Fixed grammatical mistake in init.d status output.
 2013-09-26 12:13:57 -07:00
Zane Shannon 13d0088407 Fixed grammatical mistake in init.d status output. 
"its" not "it's".
 2013-09-26 13:01:22 -05:00
Dmitriy Zaporozhets 5e843a1769 Explain on dashboard that limit amount of projects displayed 2013-09-26 19:46:31 +03:00
Dmitriy Zaporozhets a85c58c736 Dont test 1.9 with travis 2013-09-26 19:22:04 +03:00
Dmitriy Zaporozhets 12dd7d2a9a Fix issues search test 2013-09-26 19:05:55 +03:00
Dmitriy Zaporozhets 8063672add Add sleep in tests to prevent random failing when next test starts before ajax requests for old one in progress 2013-09-26 16:00:11 +03:00
Dmitriy Zaporozhets ff765bb27e Remove issues search rspec since we test it with spinach too 2013-09-26 15:56:05 +03:00
Dmitriy Zaporozhets e3f361faed Merge branch 'refactor/group_owners' of /home/git/repositories/gitlab/gitlabhq 2013-09-26 12:44:09 +00:00
Dmitriy Zaporozhets c6096e47d6 Mention permissions table on Group#members page 2013-09-26 15:08:33 +03:00
Dmitriy Zaporozhets 482f64c574 Mention group permissions on Help#permissions page 2013-09-26 15:06:00 +03:00
Dmitriy Zaporozhets 0a2a34a4d1 Ignore owner_id for Group in tests 2013-09-26 14:52:17 +03:00
Dmitriy Zaporozhets 65b9768ccf Group ownership completely based on users_groups relation now 
Before we have only owner_id to determine group owner
With multiple owners per group we should get rid of owner_id in group.
So from now @group.owner will always be nil but
@group.owners return an actual array of users who can admin this group
 2013-09-26 14:49:22 +03:00
Dmitriy Zaporozhets edd2143d35 Namespaces.owner_id can be null 2013-09-26 14:48:58 +03:00
Dmitriy Zaporozhets 3cb663f5c9 Remove project transfer page since we already have multiple owners for group 2013-09-26 10:33:06 +03:00
Dmitriy Zaporozhets 02cf9aa687 Group owner or admin can remove other group owners 2013-09-26 10:28:43 +03:00
Dmitriy Zaporozhets 8674e1c227 Group has multiple owners so no sense to show one at dashboard list 2013-09-26 10:02:18 +03:00
Dmitriy Zaporozhets a59330998e Fix remove snippet test 2013-09-25 21:33:35 +03:00
Dmitriy Zaporozhets b6adabb45d Merge branch '6-1-stable' 
Conflicts:
	lib/tasks/gitlab/check.rake
 2013-09-25 18:34:50 +03:00
Dmitriy Zaporozhets 82f3446fde Merge pull request #5174 from johannesbecker/service-pivotaltracker 
PivotalTracker Source Commits Endpoint
 2013-09-25 08:31:39 -07:00
Dmitriy Zaporozhets 7bb03a536a Hide new issue button if not authorized 2013-09-25 18:26:54 +03:00
Johannes Becker fa8588827e Syntax cleanup 2013-09-25 16:54:34 +02:00
Johannes Becker 64e012a378 Added spinach Tests for pivotaltracker service 2013-09-25 16:49:39 +02:00
Dmitriy Zaporozhets c611ea513c Fixed styling for delete button of snippet 2013-09-25 17:20:07 +03:00
Dmitriy Zaporozhets 11605c2d8d Tree files use normal font-weight 2013-09-25 16:59:38 +03:00
Dmitriy Zaporozhets 1165759b14 Merge pull request #5146 from karlhungus/feature-api-search-for-projects-by-name 
Added search for projects by name to api
 2013-09-25 06:57:34 -07:00
Dmitriy Zaporozhets 203bc7bb7e Hide some filters if current_user is nil 2013-09-25 16:54:36 +03:00
Dmitriy Zaporozhets 9d33c72616 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-09-25 16:25:56 +03:00
Dmitriy Zaporozhets f1fd47875c Merge branch 'epic/public_projects' of /home/git/repositories/gitlab/gitlabhq 2013-09-25 13:25:47 +00:00
Dmitriy Zaporozhets e8292e733b Mention public projects in CHANGELOG 2013-09-25 15:49:35 +03:00
Jacob Vosmaer 923ef6df62 Merge pull request #4800 from Rovanion/patch-1 
Remove -y option when removing ruby1.8
 2013-09-25 05:19:16 -07:00
Dmitriy Zaporozhets 0a01994466 Fix public project tests 2013-09-25 14:23:06 +03:00
Dmitriy Zaporozhets 573d367be5 Modify permissions for project and group 
* Hooks and team pages allowed only for masters/owners
* Group page allowed for admin
* Corrent authentication for Projects controller
* Hide some project elements from visitor
 2013-09-25 14:05:35 +03:00
Dmitriy Zaporozhets 087d7e554f Extend profile security specs 2013-09-25 14:05:03 +03:00
Dmitriy Zaporozhets bae15dc5f7 Version up to 6.2.0.pre 2013-09-25 14:04:32 +03:00
Dmitriy Zaporozhets 6954d50fd3 Dashboard security specs 2013-09-25 14:04:16 +03:00
Dmitriy Zaporozhets ea779cc5ab Public/Private projects security specs 2013-09-25 14:04:01 +03:00
Dmitriy Zaporozhets bcdc7b5d63 Group security tests 2013-09-25 13:27:16 +03:00
Dmitriy Zaporozhets a3c8067325 Merge branch 'gitlab-shell-check' of /home/git/repositories/gitlab/gitlabhq 2013-09-25 06:09:56 +00:00
Johannes Becker 435a5ff8a1 Remove not needed attr_accessible 2013-09-25 01:09:33 +02:00