home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
9,126 Commits 48 Branches 340 Tags
04324908fb14fe2bb0600a164a60870100122d3f
Commit Graph
333 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 207f34b890 Merge pull request #6190 from Popl7/add-better-branch-protection-against-history-rewrite-and-deletion 
protect protected branched to force updates
 2014-04-03 14:33:34 +03:00
Dmitriy Zaporozhets 9ee697dd68 Use MergeRequest services in API and controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:51:53 +03:00
Dmitriy Zaporozhets c4e81ed9de Move update issue code to separate service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 13:54:41 +03:00
Dmitriy Zaporozhets cfd9fd30d6 Move code for issue creation to service. 
The goal of suych refactoring is to get rid of observers.
Its much easier to test and code when object creation and all other
related actions done in one class instead of splited across observers,
callbacks etc.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 13:38:35 +03:00
Dmitriy Zaporozhets 33a00ceeea Create branch via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-01 10:39:53 +03:00
Dmitriy Zaporozhets 9b276f0003 Move branches api to separate class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-31 16:31:53 +03:00
Dmitriy Zaporozhets 046fa9bdb1 Merge pull request #5469 from NARKOZ/api-pagination-headers 
add 'Link' header for API response
 2014-03-31 13:46:57 +03:00
Jacob Vosmaer 200eeea258 Make the repository downloads path configurable 2014-03-31 12:19:37 +02:00
Dmitriy Zaporozhets 17fd0e5c72 Merge pull request #6569 from criteo/api_merge_request_comments 
Add method to get the comments on a merge request
 2014-03-26 10:06:51 +02:00
Steven Thonus 8b35b20837 first setup to protect protected branched to force updates 2014-03-25 22:33:14 +01:00
Ábner Silva de Oliveira e153469f31 changed doc comment for get labels of a project 2014-03-23 19:07:18 -03:00
Ábner Silva de Oliveira 44aa6b90dd added api method to return labels of a given project 2014-03-21 06:25:25 -03:00
Dmitriy Zaporozhets f18a714f35 Use GitAccess in internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-20 10:16:17 +02:00
Stuart Pook 9886998f24 Add method to get the comments on a merge request 
Add method to get the comments for a merge request and
document that you can change the status of a merge request.
 2014-03-19 19:07:51 +01:00
Dmitriy Zaporozhets c02e3d441b Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:29:45 +02:00
Dmitriy Zaporozhets 928b7f3bff Add tests for API project permissions info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:14:27 +02:00
Dmitriy Zaporozhets 0ea0e542a9 Remove old entities 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 14:35:50 +02:00
Dmitriy Zaporozhets eea317795e Add current user permissions info to /api/projects/:id.json 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 14:33:41 +02:00
Dmitriy Zaporozhets 7c60713e82 Move project members api to separate file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 13:44:54 +02:00
Dmitriy Zaporozhets fddbd7b2f0 Merge branch 'issue-110' of https://gitlab.com/gmessner/gitlab-ce into gmessner/gitlab-ce-issue-110 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-03-16 09:43:25 +02:00
Dmitriy Zaporozhets a9f2903e86 Change project lookup order for api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 15:58:52 +02:00
Dmitriy Zaporozhets 6f5a9b4110 Merge pull request #6360 from jvanbaarsen/fix-6328-expose-username 
Also expose username for the /discover endpoint
 2014-03-13 22:40:01 +02:00
Dmitriy Zaporozhets b1ff8e31b1 Add ldap check in application_controller and internal api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-10 17:10:23 +02:00
Greg Messner 7e14f86c71 Added description parameter support to Create and Update MR API endpoints (issue-110). 2014-03-03 23:08:39 -08:00
Jeroen van Baarsen c2ed468d80 Also expose username for the /discover endpoint 
Fixes #6328
 2014-02-20 10:59:03 +01:00
Dmitriy Zaporozhets 1c61ac1c64 Refactor MR code reload 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 20:17:26 +02:00
Dmitriy Zaporozhets 8686d09d3e Merge branch 'feature/api_fle_encoded' into 'master' 
Complete api files CRUD

Adds ability to read file from repository with content encoded with Base64.
 2014-02-18 14:15:40 +00:00
Dmitriy Zaporozhets 6cf39fe10d Extract commits API to separate file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 12:41:21 +02:00
Dmitriy Zaporozhets ddbe978041 Complete api files CRUD 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 12:27:02 +02:00
Dmitriy Zaporozhets 3c742dad27 Fixed bug with json files content being escaped in api 
After update to recent grape env['api.format'] does not work any more.
Use content_type for rendering raw json files content

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 11:40:45 +02:00
Dmitriy Zaporozhets 0744eac9c6 Merge pull request #6189 from jcockhren/api_ldap_check_for_user 
the existence of former ldap users doesn't imply LDAP is enabled.
 2014-02-17 09:26:10 +02:00
Dmitriy Zaporozhets f0f88390c1 project_user selectbox with ajax autocomplete 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 16:08:26 +02:00
Dmitriy Zaporozhets 1d48904ac8 Show avatars in ajax user selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 15:45:24 +02:00
Dmitriy Zaporozhets 97a4d8aea4 Improve code according to new gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-04 14:46:15 +02:00
Jurnell Cockhren e2e900a338 In the case when a user can and has authenticated with ldap, however 
ldap is disabled in the gitlab config, this fixes the API still calling
the ldap backend.
 2014-01-28 15:10:36 -06:00
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