home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,363 Commits 48 Branches 340 Tags
16697f6efa4653986753905ab9100fa11dde7f09
Commit Graph
1170 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets e44653764a Merge pull request #5798 from criteo/skip_confirmation 
Skip email confirmation with LDAP
 2013-12-10 01:43:38 -08:00
Dmitriy Zaporozhets f1c82bc56c Add gitlab-shell#path option in config 
Before this commit gitlab-shell but me placed directly in home dir.
Ex:
  /home/git/gitlab-shell

After this change you can place gitlab-shell in custom location.
Ex:
  /Users/developer/gitlab/gitlab-shell

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-09 19:32:37 +02:00
Maxime Brugidou 2c4e3e001f Skip email confirmation with LDAP 2013-12-09 11:06:12 +01:00
Jacob Vosmaer 31cdb7a405 Merge pull request #5471 from dex4er/feature_etc_default_gitlab 
Read configuration variable file (/etc/default/gitlab) if it is present
 2013-12-09 00:29:18 -08:00
Dmitriy Zaporozhets 23d180f5f1 Merge branch 'ldap_check' of /home/git/repositories/gitlab/gitlabhq 2013-12-04 14:56:19 +00:00
Dmitriy Zaporozhets 21f4e5d3ac ProjectHook API supports new event fields 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:39 +02:00
Dmitriy Zaporozhets 882029d9c6 Expose ProjectHook attributes via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-04 13:37:39 +02:00
Jacob Vosmaer 80302a0f6f Limit the number of results in gitlab:ldap:check 2013-12-03 18:51:21 +01:00
Jacob Vosmaer aa69e29e70 Merge pull request #5610 from demosdemon/patch-1 
Add client_max_body_size to nginx site
 2013-12-02 23:29:11 -08:00
Sytse Sijbrandij 71e92681f2 We welcome everyone to contribute. 2013-12-01 11:53:00 +01:00
Dmitriy Zaporozhets 73dde832c4 Merge branch 'auto_disable_color' of /home/git/repositories/gitlab/gitlabhq 2013-11-28 17:24:36 +00:00
Jacob Vosmaer 376cfc6ac6 Give more information in rake gitlab:ldap:check 2013-11-28 18:12:30 +01:00
Jacob Vosmaer 9f4909faad Add LDAP check to rake gitlab:check 2013-11-28 15:20:40 +01:00
Jacob Vosmaer 562a461c56 Disable rake color output unless connected to TTY 2013-11-27 10:09:46 +01:00
Jason Hollingsworth d9bb4230cc Adding authenticated public mode (internal). 
Added visibility_level icons to project view (rather than just text).
Added public projects to search results.
Added ability to restrict visibility levels standard users can set.
 2013-11-26 22:22:07 -06:00
Dmitriy Zaporozhets 51ae88c4e4 Improve refs parsing for git over http 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-22 12:55:20 +02:00
Dmitriy Zaporozhets 06feb3c442 Cleanup parsed refs for git over HTTP 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-22 12:41:55 +02:00
Dmitriy Zaporozhets 7e4739fe22 Merge branch 'backup_commands' of /home/git/repositories/gitlab/gitlabhq 2013-11-21 07:45:37 +00:00
Dmitriy Zaporozhets b07c02eb13 Add more info to admin dashboard 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 13:41:41 +02:00
Dmitriy Zaporozhets 7101b22c2e Recommend gitlab-shell 1.7.9 in docs and check task 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 12:34:14 +02:00
Dmitriy Zaporozhets 182aa19e26 Parse all refs when do push via HTTP and check permissions for all of them 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 11:06:19 +02:00
Dmitriy Zaporozhets 3f3b202c6e Improve files API. Relative path check added. Create dir for new file if missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 10:21:45 +02:00
Dmitriy Zaporozhets 3bab1bd4c1 Improve consistency: use file_path for API create/update/delete files 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-20 10:03:50 +02:00
Dmitriy Zaporozhets 32d7332d2c API: delete file from repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:33:38 +02:00
Dmitriy Zaporozhets 8a91e5d7d0 Fix DeleteFile satellite action 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 16:13:37 +02:00
Dmitriy Zaporozhets b26abe8ff8 Delete file action for satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 15:41:32 +02:00
Dmitriy Zaporozhets 60959df3f2 Remove gitolite mention 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-19 15:41:11 +02:00
Dmitriy Zaporozhets a09fc160d0 Add project.all for API if admin 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-18 14:15:59 +02:00
Joachim Brandon LeBlanc c09aed8b07 Add client_max_body_size to nginx site 
Added the client_max_body_size declaration to the nginx server block to prevent 413 errors when http post body is larger than the default (1m).
 2013-11-15 11:49:31 -06:00
Dmitriy Zaporozhets 0759dd4513 Namespaces API for admin users 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-15 15:24:10 +02:00
Jacob Vosmaer 0ab0ca0d9d Use gitlab-shell 1.7.8 2013-11-14 13:35:45 +01:00
Dmitriy Zaporozhets 64edb27aa9 Extend Gitlab#default_regex. Dont allow project path ends with .git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-13 16:13:40 +02:00
Marin Jankovski e16eb91299 Merge branch 'master' into relative 2013-11-12 09:26:17 +01:00
Dmitriy Zaporozhets 986697a99b Refactor Create/Update file context and lib 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-11 14:58:39 +02:00
Dmitriy Zaporozhets c77d957b36 API: Edit file in repository 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-11 14:58:06 +02:00
Dmitriy Zaporozhets 79afb001ad Fix type in API doc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-10 10:43:04 +02:00
Dmitriy Zaporozhets ca196453f0 Merge branch 'feature/api_create_file' of /home/git/repositories/gitlab/gitlabhq 2013-11-09 09:42:29 +00:00
Dmitriy Zaporozhets 9d79d6e152 Make sure private_token for API is a string 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-08 18:49:38 +02:00
Marin Jankovski 979ca7d6a2 Correct check. 2013-11-08 16:34:15 +01:00
Dmitriy Zaporozhets 0b67606af6 New API: create file in repo 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-07 18:53:09 +02:00
Dmitriy Zaporozhets c28786ecbe Require gitlab-shell 1.7.6 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 21:52:37 +02:00
Dmitriy Zaporozhets cfa15d0846 Remove default_branch support from API project creation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 19:14:11 +02:00
Jacob Vosmaer 36f3de4f59 Remove duplication in Backup::Manager 2013-11-06 14:02:28 +01:00
Jacob Vosmaer a540ab4290 Remove Bourne shell from backup code 2013-11-06 14:02:28 +01:00
Dmitriy Zaporozhets f9b66aecdd Revert "More escaping" 
This reverts commit c46eaca912.
 2013-11-05 15:35:49 +02:00
Dmitriy Zaporozhets ad41430c29 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-11-05 13:35:40 +02:00
Jacob Vosmaer 71f34f77b3 Merge pull request #5500 from nkukard/esc-strings2 
More escaping
 2013-11-05 00:30:45 -08:00
Dmitriy Zaporozhets bd2b6f5944 New feature: Create file from UI 
Now you are able to create a new file in repository from your browser.
You are not allowed to create a file if file with same name already
exists in the repo.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-05 10:28:49 +02:00
Nigel Kukard c46eaca912 More escaping 
- Database name may contain characters which are not shell friendly
- Database password could contain the same
- While we at it there is no harm in escaping generated paths too
- Refactored 2-line system(command)

Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
 2013-11-04 22:09:03 +00:00
Elias Mårtenson bc8a875df1 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-03 21:51:10 +08:00