Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace Gitlab::REVISION with Gitlab.revision and handle installations ↵46600-fix-gitlab-revision-when-not-in-git-repo | Rémy Coutable | 2018-05-24 | 1 | -1/+1 |
| | | | | | | without a .git directory Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | Merge branch ↵ | Douwe Maan | 2018-05-22 | 1 | -15/+12 |
|\ | | | | | | | | | | | | | | | | | '22846-notifications-broken-during-email-address-change-before-email-confirmed' into 'master' Resolve "notifications broken during email address change before email confirmed" Closes #22846 See merge request gitlab-org/gitlab-ce!18474 | ||||
| * | Don't set the notification_email when only unconfirmed_email is changed22846-notifications-broken-during-email-address-change-before-email-confirmed | Rémy Coutable | 2018-05-22 | 1 | -15/+12 |
| | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Expose readme url in Project API | Imre Farkas | 2018-05-22 | 3 | -4/+5 |
|/ | |||||
* | Merge branch 'create-live-trace-only-if-job-is-complete' into 'master' | Kamil Trzciński | 2018-05-21 | 1 | -0/+16 |
|\ | | | | | | | | | | | | | Append trace chunk only if job is running Closes #46383 See merge request gitlab-org/gitlab-ce!18969 | ||||
| * | Add test for the cancelled jobs | Shinya Maeda | 2018-05-21 | 1 | -0/+16 |
| | | |||||
* | | Merge branch '44799-api-naming-issue-scope' into 'master' | Rémy Coutable | 2018-05-21 | 2 | -138/+96 |
|\ \ | |/ |/| | | | | | | | | | Resolve "API naming for issue scope" Closes #44799 See merge request gitlab-org/gitlab-ce!18935 | ||||
| * | Add created_by_me and assigned_to_me scopes44799-api-naming-issue-scope | Mark Chao | 2018-05-21 | 2 | -138/+96 |
| | | | | | | | | Deprecate corresponding dash versions created-by-me and assigned-to-me | ||||
* | | Resolve "Expand API: Render an arbitrary Markdown document" | blackst0ne | 2018-05-18 | 1 | -0/+112 |
| | | |||||
* | | Move API group deletion to Sidekiq | Stan Hu | 2018-05-18 | 2 | -6/+11 |
| | | |||||
* | | Allow admin to assign shared runner to project through API | Dylan Griffith | 2018-05-16 | 1 | -0/+9 |
| | | |||||
* | | Allow group runners to be viewed/edited in API | Dylan Griffith | 2018-05-16 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'feature/add-open-id-discovery-tests' into 'master' | Rémy Coutable | 2018-05-15 | 1 | -1/+3 |
|\ \ | | | | | | | | | | | | | add values to OpenID configuration test, not only checking for issuer key See merge request gitlab-org/gitlab-ce!18773 | ||||
| * | | add values to OpenID configuration test, not only checking for issuer key | Roger Rüttimann | 2018-05-07 | 1 | -1/+3 |
| | | | |||||
* | | | Remove authentication for readonly endpoints in issues API | haseeb | 2018-05-15 | 1 | -118/+182 |
| |/ |/| | |||||
* | | Allow triggered builds git access | Bob Van Landuyt | 2018-05-11 | 1 | -0/+53 |
| | | | | | | | | | | Allow builds that have been triggered by a user before terms were enforced access to git. That way the builds can complete as usual. | ||||
* | | Block access to API & git when terms are enforced | Bob Van Landuyt | 2018-05-10 | 1 | -0/+18 |
| | | | | | | | | | | | | When terms are enforced, but the user has not accepted the terms access to the API & git is rejected with a message directing the user to the web app to accept the terms. | ||||
* | | Support 'active' setting on Runner Registration API endpoint | Tomasz Maczukin | 2018-05-09 | 1 | -0/+23 |
| | | |||||
* | | Expose runner ip address to runners API | Lars Greiss | 2018-05-08 | 1 | -0/+5 |
| | | | | | | | | Signed-off-by: Lars Greiss <l.greiss@mediacologne.de> | ||||
* | | Bump Gitaly to 0.98.0 | Zeger-Jan van de Weg | 2018-05-07 | 2 | -18/+18 |
| | | | | | | | | | | | | Hooks were run for wikis, but given the internal API wasn't responding failures happended, as seen on: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18693 | ||||
* | | Enforce proper 416 support for runner trace patch endpoint | Kamil Trzciński | 2018-05-07 | 1 | -8/+6 |
| | | |||||
* | | Merge branch 'master' into live-trace-v2 | Shinya Maeda | 2018-05-07 | 4 | -73/+117 |
|\ \ | |/ | |||||
| * | Backports every CE related change from ee-44542 to CE | Tiago Botelho | 2018-05-04 | 1 | -2/+3 |
| | | |||||
| * | Store application wide terms | Bob Van Landuyt | 2018-05-04 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | This allows admins to define terms in the application settings. Every time the terms are adjusted, a new version is stored and becomes the 'active' version. This allows tracking which specific version was accepted by a user. | ||||
| * | Merge branch 'master' into feature/runner-per-group | Dylan Griffith | 2018-05-03 | 5 | -13/+43 |
| |\ | |||||
| * | | Make assertions about runner_type in spec/requests/api/runner_spec.rb | Dylan Griffith | 2018-05-03 | 1 | -4/+9 |
| | | | |||||
| * | | Remove unnecessary API specs for group runners since we do not have API ↵ | Dylan Griffith | 2018-04-30 | 1 | -78/+1 |
| | | | | | | | | | | | | support yet | ||||
| * | | Merge branch 'master' into siemens-runner-per-group | Dylan Griffith | 2018-04-24 | 2 | -1/+14 |
| |\ \ | |||||
| * | | | runner can't be assigned to more than 1 group | Alexis Reigel | 2018-04-23 | 1 | -8/+1 |
| | | | | | | | | | | | | | | | | therefore we don't need the api check. | ||||
| * | | | disallow group runners to become project runners | Alexis Reigel | 2018-04-23 | 1 | -0/+6 |
| | | | | |||||
| * | | | revert support for v3 api | Alexis Reigel | 2018-04-23 | 1 | -45/+12 |
| | | | | |||||
| * | | | support group runners in existing API endpoints | Alexis Reigel | 2018-04-23 | 3 | -73/+218 |
| | | | | |||||
* | | | | Change BuildTraceChunkFlushWorker's queue from pipeline_processing to ↵ | Shinya Maeda | 2018-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | pipeline_background | ||||
* | | | | Clean up "when redis had an outage" context in runner spec | Shinya Maeda | 2018-05-04 | 1 | -15/+37 |
| | | | | |||||
* | | | | Introduce Redis helpers. Rename BuildTraceChunkFlushToDbWorker to ↵ | Shinya Maeda | 2018-05-04 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | Ci::BuildTraceChunkFlushWorker. | ||||
* | | | | Merge branch 'master' into live-trace-v2 | Shinya Maeda | 2018-05-03 | 3 | -7/+7 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'blackst0ne-rails5-fix-requests-specs' into 'master' | Rémy Coutable | 2018-05-02 | 3 | -7/+7 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | [Rails5] Fix `undefined method 'downcase'` errors in requests specs See merge request gitlab-org/gitlab-ce!18645 | ||||
| | * | | | [Rails5] Fix `undefined method 'downcase'` errors in requests specs | blackst0ne | 2018-04-29 | 3 | -7/+7 |
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5.0 headers are no longer inherited from Hash. This commit fixes errors in requests specs like: ``` 1) API::V3::Builds GET /projects/:id/builds/:build_id/artifacts job with artifacts when artifacts are stored locally authorized user returns specific job artifacts Failure/Error: expect(response.headers).to include(download_headers) NoMethodError: undefined method `downcase' for #<Hash:0x000055e8bccc23b0> # ./spec/requests/api/v3/builds_spec.rb:235:in `block (6 levels) in <top (required)>' ``` | ||||
* | | | | Merge branch 'master' into live-trace-v2 | Shinya Maeda | 2018-05-02 | 1 | -6/+27 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge request and commit discussions API | Jan Provaznik | 2018-05-01 | 1 | -6/+27 |
| | | | | |||||
* | | | | Merge branch 'master' into live-trace-v2 | Shinya Maeda | 2018-05-01 | 1 | -0/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | Define custom base controller for Doorkeeper | Bob Van Landuyt | 2018-04-30 | 1 | -0/+9 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | Since we only need the `can?` view helpers there, it's better to include those in a separate controller. If we inherit from `ApplicationController` we also need to deal with authentication, that needs to be done in some, but not all doorkeeper controllers. | ||||
* | | | Merge branch 'master' into live-trace-v2 | Shinya Maeda | 2018-04-24 | 2 | -1/+14 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '45576-fix-create-project-for-user-endpoint' into 'master' | Rémy Coutable | 2018-04-23 | 1 | -1/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Upgrading to API V4 Project Creation for user Fails" Closes #45576 See merge request gitlab-org/gitlab-ce!18518 | ||||
| | * | | Fix project creation for user endpoint bug | Mark Fletcher | 2018-04-23 | 1 | -1/+2 |
| | |/ | | | | | | | | | | | | | | | | In this endpoint the `jobs_enabled` parameter must be translated to `builds_enabled` before being passed to the `Projects::CreateService`. | ||||
| * | | Add 2FA filter to users API for admins only | Dmitriy Zaporozhets | 2018-04-23 | 1 | -0/+12 |
| |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge branch 'master' into live-trace-v2 | Shinya Maeda | 2018-04-23 | 1 | -0/+51 |
|\ \ | |/ | |||||
| * | Add an API endpoint to download git repository snapshots | Nick Thomas | 2018-04-19 | 1 | -0/+51 |
| | | |||||
* | | Merge branch 'master' into live-trace-v2 | Shinya Maeda | 2018-04-20 | 1 | -0/+15 |
|\ \ | |/ | |||||
| * | [API] Fix URLs in the 'Link' header for 'GET ↵ | Rémy Coutable | 2018-04-17 | 1 | -0/+15 |
| | | | | | | | | | | | | /projects/:id/repository/contributors' when no value is passed for 'order_by' or 'sort' Signed-off-by: Rémy Coutable <remy@rymai.me> |