home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
1530 Commits
Author SHA1 Message Date
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
Izaak Alpert 04c7c262a7 Used pagnation function from api helpers 
Change-Id: I1bdd3608d3b46924b5da3ae282c99f85ee4e0dab
 2013-09-24 09:22:46 -04:00
Jacob Vosmaer ddf873ad5e Add gitlab-shell/bin/check to rake gitlab:check 
We sometimes encounter connectivity issues where gitlab-shell cannot
make API calls to the Rails application. There is a self-test script
`gitlab-shell/bin/check` that tries to connect to the API; this commit
runs that script as part of `rake gitlab:check`.
 2013-09-24 14:36:57 +02:00
Hiroyuki Sato a5e19c4edc Update check script 
* GitLab Shell 1.7.1 is required
* Global projects are not supported (refs #5152)
 2013-09-24 15:32:56 +09:00
Izaak Alpert 4cfbfbb845 Added search for projects by name to api 
GITLAB-1283 (GITLAB-869)

Change-Id: I611e7e93f6292de08e1edc8d3ea77cf9087b6ded

Conflicts:
	config/initializers/1_settings.rb
 2013-09-23 19:36:25 -04:00
Izaak Alpert 8a8123a3d4 Update for readability 
fixed a test a broke in the configurable theme PR
Change-Id: Id894506941bc01ab0d259d48ca7ff9b80bb2c57e
 2013-09-22 20:56:17 -04:00
Izaak Alpert 4fcc17e667 Allows username only updates to ldap properties 
-when logging in if users are allowed to login with just usernames in ldap we will update uid of the user if their uid is out of date

Conflicts:
	spec/lib/auth_spec.rb

Change-Id: Ia171b3d5133da86edc18c0d08ecfaf6a174f2574
 2013-09-22 20:25:47 -04:00
Hiroyuki Sato b099951c55 Fix API::MergeRequest 
Refs #5145
 2013-09-22 18:46:42 +09:00
Hiroyuki Sato d426195df8 Fix API::MergeRequest 
Fixes #5144 Refs #4996
 2013-09-22 08:21:22 +09:00
Dmitriy Zaporozhets 2898d92397 Merge pull request #4996 from hiroponz/drop-support-of-root-namespace 
[WIP]Drop support of root namespace in routing
 2013-09-14 07:47:41 -07:00
Dmitriy Zaporozhets 4f9098032c Remove code that was accidently added in 5dae40f579 2013-09-14 10:14:55 +03:00
Hiroyuki Sato df9cbbc924 Drop support of root namespace in routing 2013-09-13 07:00:24 +09:00
Marin Jankovski cb6d7e5192 Rescue an error if group doesn't exist 2013-09-12 15:28:46 +02:00
Izaak Alpert 88d4559e62 Removed private scope 
Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
 2013-09-11 14:32:24 -04:00
Izaak Alpert 5dae40f579 Update to only provide one way to get a default user 
-calling build_user will now apply defaults and only override them if as: :admin is set

Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
 2013-09-11 14:04:15 -04:00
Izaak Alpert d4d4a78f83 Update User api to respect default settings 
-API now respects default_projects_limit, default_can_create_group, and default_can_create_team

Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a
 2013-09-11 14:04:15 -04:00