home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,871 Commits 48 Branches 340 Tags
6-2-stable
Commit Graph
1114 Commits
Author SHA1 Message Date
Sytse Sijbrandij 81612a6704 Update check as well. 2013-11-21 08:36:05 +01:00
Jacob Vosmaer 3909048279 Use gitlab-shell 1.7.8 2013-11-14 14:01:06 +01:00
Dmitriy ZaporozhetsandJacob Vosmaer 62a27f38b5 Make sure private_token for API is a string 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-14 13:14:41 +01:00
Elias MårtensonandJacob Vosmaer e4e96f2dea When looking up a user by DN, use single scope 
The blocked? method is used to check whether a user exists in LDAP. Prior to this change, if the LDAP server had more objects below the one pointed to by the DN, those objects would also be picked up by the search, causing the method to determine the user should be blocked.

One case where this can happen is when using Active Directory and a user have a mobile phone assigned. In this case, Exchange will add an entry called ExchangeActiveSyncDevices under the users entry. The user-visible behaviour is then that a user loses Gitlab access when he enables a mobile device.

This fix sets the search scope to BaseObject in order to ensure that only the user itself is returned.
 2013-11-04 09:35:40 +01:00
Dmitriy Zaporozhets 2d56ef52d2 Require gitlab-shell 1.7.4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-01 16:58:59 +02:00
Dmitriy Zaporozhets 33b041a346 Revert "Escape strings" 
This reverts commit 03141bfccc.
 2013-11-01 16:30:29 +02:00
Dmitriy Zaporozhets 9f9d9cff0d Revert "Best to escape strings not split them" 
This reverts commit 1ab324cb67.
 2013-11-01 16:30:18 +02:00
Dmitriy Zaporozhets 1bace9da9a Require gitlab-shell v1.7.3 2013-11-01 14:14:06 +02:00
Nigel KukardandDmitriy Zaporozhets 1ab324cb67 Best to escape strings not split them 
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
 2013-11-01 14:13:38 +02:00
Nigel KukardandDmitriy Zaporozhets 03141bfccc Escape strings 
Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
 2013-11-01 14:13:30 +02:00
Jacob Vosmaer 7d0d9c650e Restore sidekiq rake tasks 2013-11-01 12:03:15 +01:00
Jacob Vosmaer 73d19bb320 Count sidekiq processes using String#scan 
It seems there is no easy way to count pattern occurences with
String#match.
 2013-10-17 12:01:29 +02:00
Dmitriy Zaporozhets 03dba1fd42 Merge pull request #5344 from amacarthur/thread-variable-fix 
Fixing unsafe use of Thread.current variable :current_user
 2013-10-16 23:30:44 -07:00
Nihad Abbasov 12420a2256 refactor by_username_or_id 2013-10-16 22:31:46 +05:00
Nihad Abbasov e09cc195a7 fix variable name 2013-10-16 22:28:39 +05:00
Marin Jankovski f3d77a7661 Add invert match to sidekiq match. 2013-10-16 13:39:09 +02:00
Dmitriy Zaporozhets 615d859f94 Merge branch 'logrotate' of /home/git/repositories/gitlab/gitlabhq 2013-10-16 10:08:53 +00:00
Jacob Vosmaer d378332ff9 Add logrotate setup to the installation guide 2013-10-16 10:38:13 +02:00
Angus MacArthur aefe2e952f Fixing unsafe use of Thread.current variable :current_user 2013-10-16 01:20:53 -04:00
Jacob Vosmaer 6a7d63aa47 Move unicorn and sidekiq commands into bash script 2013-10-15 22:48:57 +02:00
Dmitriy Zaporozhets 2e8b0fa5cf Oauth users and users created by admin should be confirmed immediatly 2013-10-15 09:59:58 +03:00
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
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