home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
2595 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 12800e5445 Extend API Issues, MergeRequets, Milestones with iid field 2013-10-14 16:39:54 +03:00
Dmitriy Zaporozhets 1073019d36 Merge branch 'sidekiq_restart' of /home/git/repositories/gitlab/gitlabhq 2013-10-14 07:00:58 +00:00
Marin Jankovski ad3defa3c2 Skip relative links render in help page. 2013-10-11 21:41:33 +02:00
Dmitriy Zaporozhets b883d94f96 Merge branch 'relative_links_in_documentation' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 13:00:05 +00:00
Dmitriy Zaporozhets 10fac47527 Merge branch 'wiki_backup' of /home/git/repositories/gitlab/gitlabhq 2013-10-11 09:32:38 +00:00
Marin Jankovski c07251887c Merge branch 'master' into relative_links_in_documentation 2013-10-11 10:00:50 +02:00
Jacob Vosmaer cb6a86ed62 Skip rather than fail empty wikis during backup 2013-10-10 16:07:39 +02:00
Izaak Alpert a00c534c4c Fix a bug where the tgz returned got encoded utf8 
Conflicts:
	doc/api/repositories.md

Change-Id: I7ebc39b47ff860813d9622ba6776583536e6e384
 2013-10-10 09:19:28 -04:00
Izaak Alpert ce21d8688d feature API call to download repo archive 
defaults to HEAD

Conflicts:
	spec/requests/api/repositories_spec.rb

Change-Id: Id114aca6c59d75f18e49bf9f33809a04e010bfb6
 2013-10-10 09:19:28 -04:00
Marin Jankovski 4654999288 Merge branch 'master' into relative_links_in_documentation 2013-10-10 15:09:12 +02:00
Marin Jankovski 5b23a7bbb9 Cover a special case. 2013-10-10 14:29:16 +02:00
Jacob Vosmaer 8512307614 Use sidekiq restart rake task in init script 2013-10-09 16:49:01 +02:00
Jacob Vosmaer 97f124b31d Use built-in sidekiq deamonization 2013-10-09 15:51:39 +02:00
Jacob Vosmaer 7991b04499 Remove duplicate log path generation 2013-10-09 15:51:39 +02:00
Jacob Vosmaer 2128419c5b Always shut down sidekiq before starting 2013-10-09 15:51:39 +02:00
Dmitriy Zaporozhets c8e7d6df79 API: new feature - remove project[D 2013-10-09 14:41:41 +03:00
Marin Jankovski 1eabd9dfec Merge branch 'master' into relative_links_in_documentation 2013-10-09 11:07:45 +02:00
Dale HamelandDale Hamel 6d7ced4a23 Whitespace fixes to patch 2013-10-08 13:53:22 -05:00
Dale HamelandDale Hamel 1875141a96 Ensure directory exists before changing in popen 
If the directory does not exist, we want to ensure that it does.

Forking repos will fail in some situations because of this issue.
 2013-10-08 13:50:46 -05:00
Marin Jankovski 06d6f44367 Check for wiki. 2013-10-08 14:21:01 +02:00
Marin Jankovski 817399e3be Show links with correct ref. 2013-10-08 13:07:59 +02:00
Marin Jankovski 810d90dd26 Search and replace relative links in tree/readme 2013-10-08 12:24:50 +02:00
Islam AmerandJacob Vosmaer 29c807ced3 Expose votes in merge request api 
Signed-off-by: Islam Amer <islam.amer@jollamobile.com>
 2013-10-08 09:32:00 +02:00
Dmitriy Zaporozhets baa65e89b9 Check if LDAP user was removed or blocked when use git over ssh 2013-10-07 16:06:30 +03:00
Dmitriy Zaporozhets bef632e816 Merge branch 'sidekiq_stop' of /home/git/repositories/gitlab/gitlabhq 2013-10-07 12:45:20 +00:00
Jacob Vosmaer 78b3fb769c Run stopping commands in the foreground 2013-10-07 14:40:56 +02:00
Dmitriy Zaporozhets dc825ae330 Merge branch 'feature/api_remove_group' of /home/git/repositories/gitlab/gitlabhq 2013-10-07 11:32:25 +00:00
Dmitriy Zaporozhets 3db47d12f2 Merge branch 'check_hooks' of /home/git/repositories/gitlab/gitlabhq 2013-10-07 10:29:00 +00:00
Dmitriy Zaporozhets f141711cfd API: new feature - remove group 2013-10-07 13:10:01 +03:00
Jacob Vosmaer 99916fe159 Add troubleshooting hints to update hook check 2013-10-07 11:27:38 +02:00
Dmitriy Zaporozhets dc00562fa2 Merge branch 'satellite_merge' of /home/git/repositories/gitlab/gitlabhq 2013-10-04 13:26:49 +00:00
Marin Jankovski a817993439 Remove outdated comments. 2013-10-04 13:26:48 +02:00
Marin Jankovski fa7d75733c Fix failed merge when filename is the same as target branchname. 2013-10-04 12:38:49 +02:00
Jacob Vosmaer 4017789f5a Only kill sidekiqs belonging to gitlab user 2013-10-04 11:25:44 +02:00
Dmitriy Zaporozhets 1d3f03fb69 Fix blob and repo stuff after gitlab_git v3 2013-10-01 18:26:55 +03:00
Dmitriy Zaporozhets ae9dd62762 Update code to work with gitlab_git 3 2013-10-01 17:00:28 +03:00
Dmitriy Zaporozhets 715eaed6ae Refactor API: project hooks 2013-09-30 16:49:55 +03:00
Dmitriy Zaporozhets 73f780d640 API: Protect project deploy keys from unauthorized access 2013-09-30 16:47:26 +03:00
Dmitriy Zaporozhets 836104b41a Merge pull request #5213 from bladealslayer/feature/user_api_extended 
Extended User API to expose admin and can_create_group for user creation...
 2013-09-29 23:03:46 -07:00
Dmitriy Zaporozhets e48c6fab60 Make rake gitlab:test works 2013-09-29 23:36:44 +03:00
Dmitriy Zaporozhets 267e8c73f2 Use gitlab:test for travis-ci 2013-09-29 17:45:43 +03:00
Dmitriy Zaporozhets 9f8d50e996 gitlab:test rake task now includes jasmine and db setup 2013-09-29 17:43:33 +03: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 1df225bb38 Merge pull request #3006 from jweslley/master 
add rake tasks for web hooks management
 2013-09-29 05:24:11 -07:00
Boyan Tabakov 479631aafc Extended User API to expose admin and can_create_group for user creation/updating. 
Also, is_admin and can_create_group are exposed in the user information.
Fixed attributes_for_keys to process properly keys with boolean values (since false.present? is false).
 2013-09-29 11:47:29 +03: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
Jacob Vosmaer 1a9b0df767 Check whether only one sidekiq is running 2013-09-27 12:57:05 +02: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 b6adabb45d Merge branch '6-1-stable' 
Conflicts:
	lib/tasks/gitlab/check.rake
 2013-09-25 18:34:50 +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