Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'feature/api_fle_encoded' into 'master' | Dmitriy Zaporozhets | 2014-02-18 | 4 | -45/+117 | |
|\ \ | | | | | | | | | | | | | | | | Complete api files CRUD Adds ability to read file from repository with content encoded with Base64. | |||||
| * | | Extract commits API to separate file | Dmitriy Zaporozhets | 2014-02-18 | 3 | -44/+65 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Complete api files CRUD | Dmitriy Zaporozhets | 2014-02-18 | 1 | -1/+52 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Fixed bug with json files content being escaped in api | Dmitriy Zaporozhets | 2014-02-18 | 2 | -3/+3 | |
|/ / | | | | | | | | | | | | | 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> | |||||
* | | Merge pull request #6189 from jcockhren/api_ldap_check_for_user | Dmitriy Zaporozhets | 2014-02-17 | 1 | -1/+3 | |
|\ \ | | | | | | | the existence of former ldap users doesn't imply LDAP is enabled. | |||||
| * | | In the case when a user can and has authenticated with ldap, however | Jurnell Cockhren | 2014-01-28 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | ldap is disabled in the gitlab config, this fixes the API still calling the ldap backend. | |||||
* | | | project_user selectbox with ajax autocomplete | Dmitriy Zaporozhets | 2014-02-13 | 1 | -1/+13 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Show avatars in ajax user selectbox | Dmitriy Zaporozhets | 2014-02-13 | 1 | -0/+6 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Improve code according to new gitlab_git | Dmitriy Zaporozhets | 2014-02-04 | 2 | -11/+23 | |
|/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Merge branch 'improve/mr_diff' | Dmitriy Zaporozhets | 2014-01-23 | 1 | -1/+0 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | Always create merge_request_diff if MR created | Dmitriy Zaporozhets | 2014-01-22 | 1 | -1/+0 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Merge pull request #6075 from skv-headless/remove_deprecated_finders | Dmitriy Zaporozhets | 2014-01-22 | 8 | -17/+17 | |
|\ \ \ | |/ / |/| | | Remove deprecated finders | |||||
| * | | Remove deprecated finders | skv | 2014-01-19 | 8 | -17/+17 | |
| | | | ||||||
* | | | Merge branch 'add_website_url_to_user' of ↵ | Dmitriy Zaporozhets | 2014-01-19 | 2 | -2/+4 | |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG | |||||
| * | | Add website url to user | Jerome Dalbert | 2014-01-18 | 2 | -2/+4 | |
| | | | ||||||
* | | | Merge branch 'refactoring/context_into_services' into 'master' | Dmitriy Zaporozhets | 2014-01-17 | 2 | -5/+5 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Refactoring context Into services To prevent confusion where to write logic. Context or Service? | |||||
| * | | | Replace context with service in lib | Dmitriy Zaporozhets | 2014-01-16 | 2 | -5/+5 | |
| |/ / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Accept encoding attribute in files API | Dmitriy Zaporozhets | 2014-01-16 | 1 | -2/+2 | |
|/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Remove commit_load_context.rb | Dmitriy Zaporozhets | 2014-01-15 | 1 | -3/+3 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Dropped expiration date from the snippet API | Jeroen van Baarsen | 2014-01-11 | 1 | -4/+0 | |
| | | ||||||
* | | Merge pull request #5799 from criteo/import_url_api | Dmitriy Zaporozhets | 2014-01-06 | 1 | -1/+2 | |
|\ \ | | | | | | | Add import_url param in API projects create | |||||
| * | | Add import_url param in API projects create | Maxime Brugidou | 2013-12-09 | 1 | -1/+2 | |
| | | | ||||||
* | | | Merge pull request #5823 from bobot/feature/api_parent_ids | Dmitriy Zaporozhets | 2014-01-06 | 2 | -1/+5 | |
|\ \ \ | | | | | | | | | [API] add parent_ids to specific commit informations | |||||
| * | | | [API] add parent_ids to specific commit informations | François Bobot | 2013-12-11 | 2 | -1/+5 | |
| |/ / | ||||||
* | | | Add support for various archive formats. | Jason Hollingsworth | 2014-01-02 | 1 | -4/+8 | |
| | | | | | | | | | | | | | | | | | | | | | 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} | |||||
* | | | Add api support for raw blob search | Thom Gerdes | 2013-12-26 | 1 | -0/+22 | |
| | | | | | | | | | | | | | | | See issue http://feedback.gitlab.com/forums/176466-general/suggestions/4566001-expose-raw-object-search-via-the-gitlab-api | |||||
* | | | fix most of warnings | skv | 2013-12-15 | 2 | -2/+2 | |
|/ / | ||||||
* | | ProjectHook API supports new event fields | Dmitriy Zaporozhets | 2013-12-04 | 1 | -2/+3 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Expose ProjectHook attributes via API | Dmitriy Zaporozhets | 2013-12-04 | 2 | -4/+8 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Adding authenticated public mode (internal). | Jason Hollingsworth | 2013-11-26 | 2 | -7/+23 | |
| | | | | | | | | | | | | 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. | |||||
* | | Improve consistency: use file_path for API create/update/delete files | Dmitriy Zaporozhets | 2013-11-20 | 1 | -5/+3 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | API: delete file from repository | Dmitriy Zaporozhets | 2013-11-19 | 1 | -3/+31 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Add project.all for API if admin | Dmitriy Zaporozhets | 2013-11-18 | 1 | -0/+10 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Namespaces API for admin users | Dmitriy Zaporozhets | 2013-11-15 | 3 | -0/+28 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | API: Edit file in repository | Dmitriy Zaporozhets | 2013-11-11 | 1 | -2/+34 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Fix type in API doc | Dmitriy Zaporozhets | 2013-11-10 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Merge branch 'feature/api_create_file' of /home/git/repositories/gitlab/gitlabhq | Dmitriy Zaporozhets | 2013-11-09 | 2 | -0/+42 | |
|\ \ | ||||||
| * | | New API: create file in repo | Dmitriy Zaporozhets | 2013-11-07 | 2 | -0/+42 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | Make sure private_token for API is a string | Dmitriy Zaporozhets | 2013-11-08 | 1 | -1/+6 | |
|/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | Remove default_branch support from API project creation | Dmitriy Zaporozhets | 2013-11-06 | 1 | -2/+0 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | gitlab-ci service api: clean values instead of destroy | Dmitriy Zaporozhets | 2013-10-29 | 1 | -1/+5 | |
| | | ||||||
* | | API: set gitlab-ci service for project | Dmitriy Zaporozhets | 2013-10-29 | 3 | -10/+41 | |
|/ | ||||||
* | Merge pull request #5344 from amacarthur/thread-variable-fix | Dmitriy Zaporozhets | 2013-10-16 | 5 | -88/+113 | |
|\ | | | | | Fixing unsafe use of Thread.current variable :current_user | |||||
| * | Fixing unsafe use of Thread.current variable :current_user | Angus MacArthur | 2013-10-16 | 5 | -88/+113 | |
| | | ||||||
* | | refactor by_username_or_id | Nihad Abbasov | 2013-10-16 | 1 | -5/+1 | |
| | | ||||||
* | | fix variable name | Nihad Abbasov | 2013-10-16 | 1 | -1/+1 | |
|/ | ||||||
* | Extend API Issues, MergeRequets, Milestones with iid field | Dmitriy Zaporozhets | 2013-10-14 | 1 | -12/+13 | |
| | ||||||
* | Fix a bug where the tgz returned got encoded utf8 | Izaak Alpert | 2013-10-10 | 1 | -5/+9 | |
| | | | | | | | Conflicts: doc/api/repositories.md Change-Id: I7ebc39b47ff860813d9622ba6776583536e6e384 | |||||
* | feature API call to download repo archive | Izaak Alpert | 2013-10-10 | 1 | -1/+25 | |
| | | | | | | | | | defaults to HEAD Conflicts: spec/requests/api/repositories_spec.rb Change-Id: Id114aca6c59d75f18e49bf9f33809a04e010bfb6 | |||||
* | API: new feature - remove project[D | Dmitriy Zaporozhets | 2013-10-09 | 2 | -1/+10 | |
| |