home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,310 Commits 48 Branches 340 Tags
ec1055076c400a579d87fe970da342617efd4f94
Commit Graph
201 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets c3ba0ee64b Merge branch 'feature_teams_api' of https://github.com/former03/gitlabhq into former03-feature_teams_api 
Conflicts:
	doc/api/README.md
 2013-05-27 15:05:01 +03:00
Dmitriy Zaporozhets 068cf2f467 split repositories and projects api 2013-05-23 12:23:47 +03:00
Christian Simon 0ebfa5e5a2 [FEATURE] Basic user_teams api 
* Closing #3066
 * Closing #3609
 2013-05-21 23:13:30 +02:00
Dmitriy Zaporozhets 634cbd7138 Refactor API classes. So api classes like Gitlab::Issues become API::Issues 2013-05-14 15:33:31 +03:00
Dmitriy Zaporozhets af5d0e9e92 Merge pull request #3275 from Undev/feature/code_cleanup_remove_old_hashes 
Code cleanup: Replace old hashes and remove trailing spaces
 2013-05-07 06:59:03 -07:00
Nihad Abbasov 77d0e41df0 fix API route to delete project hook 2013-05-07 00:09:23 +05:00
Dmitriy Zaporozhets 4528fa9817 modify api to work with new deploy keys 2013-05-06 16:24:58 +03:00
Andrey Kumanyaev b1b354b0f8 remove trailing spaces 2013-05-05 18:02:02 +04:00
Dmitriy Zaporozhets ae2f5ecdf7 Add support for git-archive in gitlab internal api 2013-04-20 15:43:48 +03:00
Dmitriy Zaporozhets e79ab4bdb9 Merge pull request #3209 from tsl0922/master 
Fix: API 500 error when project does not exists
 2013-04-18 03:25:03 -07:00
Dmitriy Zaporozhets 880cb8aa48 Paginate users in users api 2013-04-16 09:26:01 +03:00
Dmitriy Zaporozhets dfeef6c228 Fixed API file raw functionality, Fixed tree controller tests. Added BlobController specs 2013-04-03 15:55:08 +03:00
Dmitriy Zaporozhets 541d899410 Project.repository should never be nil so you can call repository.exists? or repository.empty? 
Also specify separate project factory for project with filled repo
 2013-04-01 16:56:25 +03:00
Dmitriy Zaporozhets 63e6f055f1 Fix notify specs. Fix merge request close via api 2013-03-28 13:24:01 +02:00
Dmitriy Zaporozhets 3b42c267a6 Dont show blocked users in autocomplete 2013-03-19 18:07:14 +02:00
Dmitriy Zaporozhets 124a5e270e add attachemnts support for wall 2013-03-19 13:28:29 +02:00
Dmitriy Zaporozhets 4d378f3c9a load notes for wall via api 2013-03-19 12:35:55 +02:00
Alex Denisov a15fe61fb0 API docs updated 2013-03-19 04:47:08 +00:00
Alex Denisov 28e7d1a8bf Abilities added to /user and /sign_in requests 2013-03-18 20:11:28 +00:00
Kevin Lyda 415bade302 Result of misspellings run. 
Most of these are comments but a few are strings for users.

Might be an idea to run this from time to time:
https://github.com/lyda/misspell-check

It runs mostly clean now.
 2013-03-17 19:46:54 +00:00
Dmitriy Zaporozhets 71ab011a17 Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis 
Conflicts:
	app/views/layouts/project_resource.html.haml
	app/views/wikis/edit.html.haml
	app/views/wikis/pages.html.haml
	app/views/wikis/show.html.haml
	spec/features/gitlab_flavored_markdown_spec.rb
 2013-03-15 16:55:07 +02:00
tsl0922 1e11e45fa3 Fix: API 500 error when project does not exists 2013-03-14 15:02:36 +08:00
Dmitriy Zaporozhets bf17d976a7 add api users filter and integrate users select2 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets 11b57d979c Reduce amount of user info provided with internal api 2013-03-11 14:35:00 +02:00
Dan Knox ea9b3687db Replace current Wiki system with Gollum Wikis. 
This commit replaces the old database backed Wiki system with the
excellent Gollum git based Wiki system.

The UI has been updated to allow for utilizing the extra features
that Gollum provides. Specifically:

* Edit page now allows you to choose the content format.
* Edit page allows you to provide a commit message for the change.
* History page now shows Format, Commit Message, and Commit Hash.
* A new Git Access page has been added with the Wiki Repo URL.
* The default page has been changed to Home from Index to match
the Gollum standard.

The old Wiki model has been left in tact to provide for the
development of a migration script that will move all content stored
in the old Wiki system into new Gollum Wikis.
 2013-03-09 16:39:51 -08:00
Sebastian Ziebell 562de2a438 Merge branch 'master' into api/system_hooks_adjustments 2013-03-07 17:59:27 +01:00
Sebastian Ziebell 32f1eaaf0f API: system hooks API functions and documentation updated 
* updated system hooks documentation and code comments
* fixed access to system hooks if no user given resulting in a `500 Server Error`
* added tests
 2013-03-07 17:56:11 +01:00
Dmitriy Zaporozhets a7055be1fd Merge pull request #2835 from Asquera/fixes/api 
Fix API return codes
 2013-03-07 08:33:34 -08:00
Sebastian Ziebell ecf53bb9e6 API: fixes project creation and removed redundant info 2013-03-07 15:11:33 +01:00
Sebastian Ziebell 3374027e3a Merge branch 'master' into fixes/api, code clean up and tests fixed 
Conflicts:
	doc/api/projects.md
	spec/requests/api/projects_spec.rb
 2013-03-07 14:51:56 +01:00
Dmitriy Zaporozhets d2cec12632 block user should not be able to push 2013-03-07 14:18:30 +02:00
Dmitriy Zaporozhets 7c408960ce Merge pull request #3146 from amacarthur/AdminAPIs 
Additional Admin APIs
 2013-03-06 22:57:24 -08:00
Dmitriy Zaporozhets afee5303ff Merge pull request #3149 from m4tthumphrey/api-deploy-keys 
Added methods to manage project deploy keys via API
 2013-03-06 07:43:45 -08:00
Matt Humphrey 1dd712ddc2 System hooks API. 2013-03-06 15:15:26 +00:00
Sebastian Ziebell b5ef6d2268 API: refactored and simplified error handling in merge requests API 2013-03-05 23:43:05 +01:00
Sebastian Ziebell cce35b6d05 Fixes api 2013-03-05 22:33:45 +01:00
Sebastian Ziebell 61cfa2a7a6 Merge branch 'master' into fixes/api 
Conflicts:
	lib/api/projects.rb
 2013-03-05 22:29:49 +01:00
Matt Humphrey f411772e33 Project deploy keys API 2013-03-05 21:23:29 +00:00
Angus MacArthurandAngus MacArthur 61ffcab60f Additional Admin APIs 2013-03-05 10:38:43 -05:00
Andrew8xx8 0d9a6fe7b1 User's blocked field refactored to use state machine 2013-03-04 18:52:30 +04:00
Matt Humphrey 1c0c7bd6e3 Missed comma. 2013-03-01 16:36:19 +00:00
Matt Humphrey dd653f62f3 Added namespace_id to project creation via API 
This allows you to set the namespace ID for projects via the the API. By default it is created for the current user. You can assign it to the global namespace by passing `GLN` which translates to 'Global Namespace'.
 2013-03-01 16:34:11 +00:00
Sebastian Ziebell d269d107d8 API: fixed adding a note 
Now the correct attribute is checked if it's available or not. Also fixed a test.
 2013-02-27 18:12:02 +01:00
Sebastian Ziebell 3bb342b961 Merge branch 'master' into fixes/api 2013-02-27 17:52:59 +01:00
Sebastian Ziebell 7499f65014 API: extracted helper method to validate required parameters, code clean up 
Added a helper method to check if required parameters are given in an API call. Can be used
to return a `400 Bad Request` return code if a required attribute is missing.
Code clean up and fixed tests.
 2013-02-27 17:50:30 +01:00
Nihad Abbasov 3c5954b8c8 proper fix for #2300 2013-02-27 06:47:04 -08:00
Sebastian Ziebell 07f306d8af Merge branch 'master' into fixes/api 2013-02-27 15:15:47 +01:00
Sebastian Ziebell 3b3add35fb API: merge request documentation updated, added return codes to functions 
The API documentation of merge requests contains info to status codes for all functions.
Required arguments are now checked in the merge requests API functions and a `400 Bad Request` error is
returned if they are not given.
 2013-02-27 15:07:42 +01:00
Nihad Abbasov 8d847b89d2 API: fix commits pagination 
closes #2300
 2013-02-27 06:00:33 -08:00
Sebastian Ziebell e96d77d3db API: issues documentation and API functions updated 
The issues documentation is updated with infos to status codes and the deprecated `DELETE` function and
how to close an issue. A few more tests added to check status codes of API functions.
 2013-02-27 14:36:20 +01:00