| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #6190 from ↵ | Dmitriy Zaporozhets | 2014-04-03 | 1 | -1/+3 |
| |\ | | | | | | | | | Popl7/add-better-branch-protection-against-history-rewrite-and-deletion protect protected branched to force updates | ||||
| | * | first setup to protect protected branched to force updates | Steven Thonus | 2014-03-25 | 1 | -1/+3 |
| | | | |||||
| * | | Use MergeRequest services in API and controllers | Dmitriy Zaporozhets | 2014-04-02 | 1 | -41/+17 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Move update issue code to separate service | Dmitriy Zaporozhets | 2014-04-02 | 1 | -10/+10 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Move code for issue creation to service. | Dmitriy Zaporozhets | 2014-04-02 | 1 | -11/+9 |
| | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | | Create branch via API | Dmitriy Zaporozhets | 2014-04-01 | 2 | -0/+19 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Move branches api to separate class | Dmitriy Zaporozhets | 2014-03-31 | 4 | -70/+72 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge pull request #5469 from NARKOZ/api-pagination-headers | Dmitriy Zaporozhets | 2014-03-31 | 1 | -2/+18 |
| |\ \ | | | | | | | add 'Link' header for API response | ||||
| | * | | add 'Link' header for API response | Nihad Abbasov | 2013-10-29 | 1 | -2/+18 |
| | | | | |||||
| * | | | Make the repository downloads path configurable | Jacob Vosmaer | 2014-03-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #6569 from criteo/api_merge_request_comments | Dmitriy Zaporozhets | 2014-03-26 | 1 | -0/+16 |
| |\ \ \ | |_|/ |/| | | Add method to get the comments on a merge request | ||||
| | * | | Add method to get the comments on a merge request | Stuart Pook | 2014-03-19 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | Add method to get the comments for a merge request and document that you can change the status of a merge request. | ||||
| * | | | changed doc comment for get labels of a project | Ábner Silva de Oliveira | 2014-03-23 | 1 | -2/+4 |
| | | | | |||||
| * | | | added api method to return labels of a given project | Ábner Silva de Oliveira | 2014-03-21 | 2 | -0/+13 |
| | | | | |||||
| * | | | Use GitAccess in internal api | Dmitriy Zaporozhets | 2014-03-20 | 1 | -41/+19 |
| |/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Fix tests | Dmitriy Zaporozhets | 2014-03-17 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Add tests for API project permissions info | Dmitriy Zaporozhets | 2014-03-17 | 1 | -1/+3 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Remove old entities | Dmitriy Zaporozhets | 2014-03-17 | 1 | -12/+0 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Add current user permissions info to /api/projects/:id.json | Dmitriy Zaporozhets | 2014-03-17 | 2 | -2/+24 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Move project members api to separate file | Dmitriy Zaporozhets | 2014-03-17 | 4 | -114/+115 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge branch 'issue-110' of https://gitlab.com/gmessner/gitlab-ce into ↵ | Dmitriy Zaporozhets | 2014-03-16 | 1 | -2/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | gmessner/gitlab-ce-issue-110 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG | ||||
| | * | | Added description parameter support to Create and Update MR API endpoints ↵ | Greg Messner | 2014-03-03 | 1 | -2/+4 |
| | | | | | | | | | | | | | (issue-110). | ||||
| * | | | Change project lookup order for api | Dmitriy Zaporozhets | 2014-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Merge pull request #6360 from jvanbaarsen/fix-6328-expose-username | Dmitriy Zaporozhets | 2014-03-13 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Also expose username for the /discover endpoint | ||||
| | * | | | Also expose username for the /discover endpoint | Jeroen van Baarsen | 2014-02-20 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | Fixes #6328 | ||||
| * | | | Add ldap check in application_controller and internal api | Dmitriy Zaporozhets | 2014-03-10 | 1 | -1/+7 |
| |/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Refactor MR code reload | Dmitriy Zaporozhets | 2014-02-18 | 1 | -2/+0 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | 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 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |