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
7,994 Commits 48 Branches 340 Tags
be150fa9913d760802dc4c673ed59930f03ffec0
Commit Graph
297 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 28e13634dc Merge branch 'improve/mr_diff' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/project_fork.rb
	features/steps/project/project_forked_merge_requests.rb
	features/steps/project/project_issue_tracker.rb
	features/steps/project/project_markdown_render.rb
	features/steps/shared/project.rb
 2014-01-23 14:38:23 +02:00
Dmitriy Zaporozhets 4d56c359d3 Merge pull request #6075 from skv-headless/remove_deprecated_finders 
Remove deprecated finders
 2014-01-22 11:04:56 -08:00
Dmitriy Zaporozhets 4b3afe2325 Always create merge_request_diff if MR created 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 20:22:20 +02:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Dmitriy Zaporozhets f8aae4b7d8 Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-01-19 20:23:29 +02:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
Dmitriy Zaporozhets f0d2d28118 Merge branch 'refactoring/context_into_services' into 'master' 
Refactoring context Into services

To prevent confusion where to write logic. Context or Service?
 2014-01-17 09:47:47 +00:00
Dmitriy Zaporozhets efa10c819d Replace context with service in lib 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 20:35:21 +02:00
Dmitriy Zaporozhets 4f2e9fb8e5 Accept encoding attribute in files API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 18:11:00 +02:00
Dmitriy Zaporozhets f19cdee8cc Remove commit_load_context.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 15:06:12 +02:00
Jeroen van Baarsen ef404d8ea6 Dropped expiration date from the snippet API 2014-01-11 18:40:17 +01:00
Dmitriy Zaporozhets 6579de0727 Merge pull request #5799 from criteo/import_url_api 
Add import_url param in API projects create
 2014-01-06 06:18:26 -08:00
Dmitriy Zaporozhets 1c0929f5ac Merge pull request #5823 from bobot/feature/api_parent_ids 
[API] add parent_ids to specific commit informations
 2014-01-06 06:15:48 -08:00
Jason Hollingsworth 7cc2520541 Add support for various archive formats. 
Used mime-types gem instead of hardcoding content types.
Allow multiple extensions in archive route (.tar.gz, .tar.bz2).
Change content disposition from infile(?) to attachment for api.
Fixed api would return “archive” instead of {project}-{hash}.{ext}
 2014-01-02 10:18:56 -06:00
Thom Gerdes 27912f9c21 Add api support for raw blob search 
See issue
http://feedback.gitlab.com/forums/176466-general/suggestions/4566001-expose-raw-object-search-via-the-gitlab-api
 2013-12-26 08:54:13 -05:00
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00
François Bobot 7b3b63d4d4 [API] add parent_ids to specific commit informations 2013-12-11 14:41:07 +01:00
Maxime Brugidou 56d4788264 Add import_url param in API projects create 2013-12-09 11:07:32 +01: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
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 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 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
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
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
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 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
Dmitriy Zaporozhets ee0e9830c1 gitlab-ci service api: clean values instead of destroy 2013-10-29 18:13:51 +02:00
Dmitriy Zaporozhets d636ad49bf API: set gitlab-ci service for project 2013-10-29 16:39:46 +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
Angus MacArthur aefe2e952f Fixing unsafe use of Thread.current variable :current_user 2013-10-16 01:20:53 -04:00
Dmitriy Zaporozhets 12800e5445 Extend API Issues, MergeRequets, Milestones with iid field 2013-10-14 16:39:54 +03: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
Dmitriy Zaporozhets c8e7d6df79 API: new feature - remove project[D 2013-10-09 14:41:41 +03: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 f141711cfd API: new feature - remove group 2013-10-07 13:10:01 +03:00
Dmitriy Zaporozhets 1d3f03fb69 Fix blob and repo stuff after gitlab_git v3 2013-10-01 18:26:55 +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 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
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