Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge branch 'master' into merge-if-green | Zeger-Jan van de Weg | 2015-12-07 | 3 | -8/+56 | |
|\ \ \ | |/ / | ||||||
| * | | Merge branch 'extend-events-api' | Dmitriy Zaporozhets | 2015-12-04 | 1 | -0/+3 | |
| |\ \ | ||||||
| | * | | Extent Event and Note APIextend-events-api | Dmitriy Zaporozhets | 2015-12-04 | 1 | -0/+3 | |
| | |/ | | | | | | | | | | | | | | | | | | | | | | * add note to Events API * add author section to Events API * add noteable_id and noteable_type to Notes API Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Add API endpoint to fetch merge request commits list | Dmitriy Zaporozhets | 2015-12-04 | 1 | -0/+16 | |
| |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Merge branch 'fix-award-emoji-api' into 'master' | Robert Speicher | 2015-11-22 | 1 | -0/+5 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add upvote/downvote fields to merge request and note API to preserve compatibility As discussed in !1825 we should not break the API compatibility. * This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`. * Add the fields `upvote`/`downvote` to the notes API, which always return `false` This behavior is documented in the API docs. See merge request !1867 | |||||
| | * | Add upvote/downvote fields to merge request and note API to preserve ↵fix-award-emoji-api | Robert Schilling | 2015-11-21 | 1 | -0/+5 | |
| | | | | | | | | | | | | compatibility | |||||
| * | | Allow editing a release in API via PUT method | Robert Schilling | 2015-11-21 | 1 | -0/+21 | |
| | | | ||||||
| * | | Only allow to create a release if it does not exist yet | Robert Schilling | 2015-11-21 | 1 | -2/+2 | |
| | | | ||||||
| * | | Use POST to create a new release instead of PUT | Robert Schilling | 2015-11-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | API: Return 404 if the tag for a release does not exist | Robert Schilling | 2015-11-21 | 1 | -3/+7 | |
| | | | ||||||
| * | | Make tag API consistent for release feature | Robert Schilling | 2015-11-21 | 2 | -5/+6 | |
| |/ | ||||||
| * | award emoji | Valery Sizov | 2015-11-19 | 1 | -3/+1 | |
| | | ||||||
* | | Specs for 'Merge When Build Succeeds' | Zeger-Jan van de Weg | 2015-12-02 | 2 | -14/+9 | |
| | | ||||||
* | | Refactor MergeWhenBuildSucceedsService and incorporate feedback | Zeger-Jan van de Weg | 2015-11-23 | 1 | -23/+13 | |
| | | ||||||
* | | Merge branch 'master' into merge-if-green | Zeger-Jan van de Weg | 2015-11-18 | 7 | -57/+150 | |
|\ \ | |/ | ||||||
| * | Merge branch 'releases-feature' | Dmitriy Zaporozhets | 2015-11-16 | 4 | -54/+91 | |
| |\ | ||||||
| | * | Add API docs and correctly expose release api | Dmitriy Zaporozhets | 2015-11-12 | 2 | -26/+26 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | Expose release notes to tags api | Dmitriy Zaporozhets | 2015-11-12 | 1 | -0/+6 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | Add releases api | Dmitriy Zaporozhets | 2015-11-12 | 2 | -1/+22 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| | * | Move git tags API to separate file | Dmitriy Zaporozhets | 2015-11-12 | 3 | -35/+45 | |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Expose CI enable option in project features | Kamil Trzcinski | 2015-11-13 | 2 | -1/+7 | |
| |/ | | | | | | | - Enable CI by default for all new projects | |||||
| * | Merge branch 'artifacts' into 'master' | Kamil Trzciński | 2015-11-11 | 1 | -0/+48 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Build Artifacts This implements #3028 1. It stores artifacts in shared/artifacts, 1. It adds `artifacts` to `.gitlab-ci.yml`, 1. We use GitLab Workhorse to offload artifacts uploading, 1. To download artifacts it uses GitLab Workhorse X-Sendfile extension, 1. There's one "artifact" per-build. The new upload removes previous one and creates a new one, 1. Default max artifact size is set to 100MB - this can be changed in settings. Missing things: 1. Support for `.gitlab-ci.yml`: `artifacts: true or git-ls-files` which will upload all non tracked files, 1. Artifacts passing between builds. GitLab Workhorse changes: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/5 GitLab Runner changes: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/46 Syntax: ``` artifacts: untracked: true # default: false paths: # default: empty - bin/files ``` See merge request !1584 | |||||
| | * | Use normal file upload mechanism to upload artifacts | Kamil Trzcinski | 2015-11-10 | 1 | -6/+10 | |
| | | | ||||||
| | * | Move tmp artifacts to shared/artifacts/tmp/. Check for GitLab-Workhorse now | Kamil Trzcinski | 2015-11-10 | 1 | -1/+1 | |
| | | | ||||||
| | * | Implement Build Artifacts | Kamil Trzcinski | 2015-11-10 | 1 | -0/+44 | |
| | | | | | | | | | | | | | | | | | | | | | - Offloads uploading to GitLab Workhorse - Use /authorize request for fast uploading - Added backup recipes for artifacts - Support download acceleration using X-Sendfile | |||||
| * | | Add allow_failure field to commit status API | Stan Hu | 2015-11-03 | 1 | -1/+1 | |
| |/ | | | | | | | Closes #3196 | |||||
| * | Add ability to fetch the commit ID of the last commit that actually touched ↵api_file_touched_at | Valery Sizov | 2015-11-02 | 1 | -1/+3 | |
| | | | | | | | | a file | |||||
* | | API support, incorporated feedback | Zeger-Jan van de Weg | 2015-11-18 | 1 | -22/+46 | |
|/ | ||||||
* | Merge pull request #9762 from ↵ | Stan Hu | 2015-10-22 | 2 | -2/+2 | |
|\ | | | | | | | | | huacnlee/fix/api-helpers-bad-autoload-name-for-master Fix API::APIHelpers -> API::Helpers again for master | |||||
| * | Fix API::APIHelpers -> API::Helpers; | Jason Lee | 2015-10-23 | 2 | -2/+2 | |
| | | | | | | | | Rails Autoload find file to require is use , APIHelpers -> api_helpers.rb, not helpers.rb; | |||||
* | | Merge branch 'master' into remove-forks-from-projects-settings | Han Loong Liauw | 2015-10-17 | 6 | -16/+113 | |
|\ \ | ||||||
| * \ | Merge branch 'stanhu/gitlab-ce-fix-api-mr-comment-notifications' | Dmitriy Zaporozhets | 2015-10-15 | 1 | -2/+10 | |
| |\ \ | ||||||
| | * | | Fix bug where merge request comments created by API would not trigger ↵ | Stan Hu | 2015-10-10 | 1 | -2/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | notifications Closes https://github.com/gitlabhq/gitlabhq/issues/9715 | |||||
| * | | | Merge branch 'master' into git-archive-golanggit-archive-golang | Douwe Maan | 2015-10-15 | 5 | -2/+102 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-cecernvcs_hide_passwrd | Valery Sizov | 2015-10-14 | 2 | -1/+13 | |
| | |\ \ \ | | | |_|/ | | |/| | | ||||||
| | | * | | Hide passwords to non-admin users in the services API | Alex Lossent | 2015-10-12 | 2 | -1/+13 | |
| | | |/ | | | | | | | | | | | | | In order to be consistent with !1490 doing it for the web interface | |||||
| | * | | [ci skip] Fix wrong comment | sue445 | 2015-10-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | According to `attributes_for_keys` and API doc, `POST /projects/:id/merge_requests` is received `target_project_id` (NOT `target_project`) | |||||
| | * | | Fix broken tests | Kamil Trzcinski | 2015-10-12 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Fix some changes | Kamil Trzcinski | 2015-10-12 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Update rendering | Kamil Trzcinski | 2015-10-12 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Small bug fixes | Kamil Trzcinski | 2015-10-12 | 1 | -2/+3 | |
| | | | | ||||||
| | * | | Add Commit Status documentation | Kamil Trzcinski | 2015-10-12 | 1 | -10/+10 | |
| | | | | ||||||
| | * | | Add author to statuses | Kamil Trzcinski | 2015-10-12 | 2 | -1/+2 | |
| | | | | ||||||
| | * | | Fix commit status POST URL | Kamil Trzcinski | 2015-10-12 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Implement Commit Status API | Kamil Trzcinski | 2015-10-12 | 3 | -1/+87 | |
| | |/ | ||||||
| * | | Let gitlab-git-http-server handle archive downloads | Jacob Vosmaer | 2015-10-08 | 1 | -12/+1 | |
| |/ | | | | | | | This change relies on changes in gitlab_git and gitlab-git-http-server. | |||||
* | | Made suggested content changes based on MR Review | Han Loong Liauw | 2015-10-14 | 1 | -1/+1 | |
| | | | | | | | | | | Changed the authentication method for removing fork through API Reflected changes to new auth method in API specs | |||||
* | | Adds ability to remove the forked relationship | Han Loong Liauw | 2015-10-13 | 1 | -1/+1 | |
|/ | | | | | | | This was previously possible through the API but can now be done through the project#edit settings screen if the current user is the owner of the project. Update changelog | |||||
* | Fix rubocop warnings in lib | Guilherme Garnier | 2015-10-03 | 1 | -3/+2 | |
| | ||||||
* | api: add enable_ssl_verification to PUT/POST hooks | Ben Boeckel | 2015-09-24 | 1 | -2/+4 | |
| |