summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'help-landing-page-customizations' into 'master'Douwe Maan2017-06-141-0/+3
|\ | | | | | | | | Allow more customization to Help landing page See merge request !11878
| * Help landing page customizationsRobin Bobbitt2017-06-141-0/+3
| |
* | Rename API::Entities::JobRequest::ServiceImage to ↵Tomasz Maczukin2017-06-121-2/+2
| | | | | | | | API::Entities::JobRequest::Service
* | Send new configuration options with job's payloadTomasz Maczukin2017-06-121-2/+6
|/
* Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-071-2/+2
|\ | | | | | | | | | | | | Support descriptions for snippets Closes #31894 See merge request !11071
| * Support descriptions for snippetsJarka Kadlecova2017-05-311-2/+2
| |
* | Merge branch 'projects-api-import-status' into 'master'Douwe Maan2017-06-021-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Expose import_status in Projects API Closes #19646 See merge request !11851
| * | Expose import_status in Projects APIRobin Bobbitt2017-06-021-0/+2
| | |
* | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-011-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Implementation for protected variables Closes #24196 See merge request !11688
| * | Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-011-0/+22
| |\ \ | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ \ Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-06-011-0/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (141 commits) Add Documentation for GIT_CHECKOUT variable Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Use another scope to add the - prefix, feedback: Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions ...
| * \ \ \ Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-05-311-1/+4
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (89 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
| * | | | Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)2017-05-261-1/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | API and doc for protected variablesLin Jen-Shin2017-05-251-0/+1
| | | | | |
* | | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-011-3/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Consistent diff and blob size limit names See merge request !11776
| * | | | | Change no_limits to limitsdm-collapsed-blobDouwe Maan2017-05-311-3/+3
| | | | | |
| * | | | | Consistent diff and blob size limit namesDouwe Maan2017-05-291-3/+3
| | |_|/ / | |/| | |
* | | | | Add feature toggles through FlipperAlejandro Rodríguez2017-05-311-0/+22
| |_|_|/ |/| | |
* | | | Use PipelineScheduleDetailsShinya Maeda2017-05-301-1/+4
| | | |
* | | | Remove deleted_at from Entity. Use find_by. Remove returns.Shinya Maeda2017-05-301-1/+1
| | | |
* | | | Expose last_pipeline only when detailed statusShinya Maeda2017-05-301-1/+1
| | | |
* | | | Include owner for pipeline_schedules. Improve N+1 spec. Use PipelineBasic ↵Shinya Maeda2017-05-301-1/+1
| | | | | | | | | | | | | | | | for small payload.
* | | | includes last_pipelineShinya Maeda2017-05-301-3/+1
| | | |
* | | | Define last_pipeline in PipelineScheduleEntityShinya Maeda2017-05-301-1/+3
| | | |
* | | | Remove if from last_pipeline in entityShinya Maeda2017-05-301-1/+1
| | | |
* | | | Add API support for pipeline scheduleShinya Maeda2017-05-301-0/+8
|/ / /
* | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-291-1/+4
|\ \ \ | |_|/ |/| | | | | | | | Rework project authorizations and nested groups for better performance See merge request !10885
| * | Hide nested group UI/API support for MySQLYorick Peterse2017-05-171-1/+4
| | | | | | | | | | | | | | | | | | This hides/disables some UI elements and API parameters related to nested groups when MySQL is used, since nested groups are not supported for MySQL.
* | | Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan2017-05-231-1/+3
| |/ |/|
* | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458cDouwe Maan2017-05-161-2/+2
| | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287
* | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"Douwe Maan2017-05-151-2/+2
| | | | | | This reverts merge request !11287
* | Rename `build_events` to `job_events` in codeBob Van Landuyt2017-05-151-2/+2
|/
* Update SystemHooks API to expose and handle new repository_update_eventsGabriel Mazetto2017-05-121-1/+1
|
* Use relative paths for group/project/user avatarsblackst0ne2017-05-101-3/+10
|
* Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-041-1/+5
|
* Don't display the `is_admin?` flag for user API responses.Timothy Andrew2017-04-251-2/+2
| | | | | | | | | | | - To prevent an attacker from enumerating the `/users` API to get a list of all the admins. - Display the `is_admin?` flag wherever we display the `private_token` - at the moment, there are two instances: - When an admin uses `sudo` to view the `/user` endpoint - When logging in using the `/session` endpoint
* Expose `last_activity_on` in the User APIRémy Coutable2017-04-141-1/+3
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Port 'Add user activities API' to CESean McGivern2017-04-141-0/+5
| | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/962
* Remove the User#is_admin? methodblackst0ne2017-04-091-3/+3
|
* Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-061-1/+2
|\ | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss
| * Merge branch '22303-symbolic-in-tree' into 'master' Douwe Maan2017-04-031-1/+1
| |\ | | | | | | | | | | | | | | | | | | #22303 fix mode representation git::tree ( in base 8 ) Closes #22303 See merge request !9780
| | * Fix symlink icon in project treemhasbini2017-04-021-1/+1
| | |
| * | Introduce "polling_interval_multiplier" as application settingAdam Niedzielski2017-04-031-0/+1
| |/ | | | | | | | | Implement module for setting "Poll-Interval" response header. Return 429 in ETag caching middleware when polling is disabled.
* | Fixed developers_can_push in RepoBranch API entityJames Edwards-Jones2017-04-041-6/+2
| |
* | Moved Project#protected_branch? to ProtectedBranch, similar for tagsJames Edwards-Jones2017-04-031-1/+1
| |
* | Extract ProtectedRef ConcernJames Edwards-Jones2017-04-031-2/+2
|/
* Send only defined dependenciesTomasz Maczukin2017-03-201-1/+1
| | | | | | | | | | | | | | In APIv1 we've been sending all jobs from previous stages and a `dependencies` list with names of jobs that user want to download artifacts from. This was selected on Runners side. In APIv1 we've planned to send only jobs that were defined (if any; and all previous jobs by default). However I've missed the fact that it was Runner who selected jobs, not GitLab. And now current version of APIV4 sends all jobs everytime. This commit fixes this. If user will define `dependencies` in his job, then GitLab will send only selected jobs.
* Send token of depenent jobTomasz Maczukin2017-03-201-1/+1
| | | | | | | | | | | | Artifacts download for authorization is using a job token of job to which the artifact belongs. In APIv1 the token was sent with dependent jobs details and in APIv4 it was designed to also contain it. However I forgot about this parameter while working on `/api/v4/jobs/request` endpoint. This commit adds a missing parameter which is required for APIv4 to work properly.
* Merge remote-tracking branch ↵Douwe Maan2017-03-071-0/+16
|\ | | | | | | 'origin/personal_access_token_api_and_impersonation_token'
| * applies relevant changes to the code and code structureTiago Botelho2017-02-281-3/+6
| |