Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-11-23Merge branch 'api-delete-group-share' into 'master' Rémy Coutable
API: Add endpoint to delete a group share Closes #24771 See merge request !7662
2016-11-23API: Add endpoint to delete a group shareRobert Schilling
2016-11-23Add a starting date to milestonesValery Sizov
2016-11-22Fix IID filter for merge requests and milestonesRobert Schilling
2016-11-21Merge branch 'feature/send-registry-address-with-build-payload' into 'master' Kamil Trzciński
Send registry address with build payload ## What does this MR do? Adds `registry_url` as a part of a build payload, when sending a response to a GitLab Runner which requested a new build. ## Are there points in the code the reviewer needs to double check? Change in `lib/ci/api/entities.rb`. ## Why was this MR needed? This is one of the steps needed to add support for private/protected registries hosted with GitLab CE/EE. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Related to gitlab-org/gitlab-ci-multi-runner#1828, gitlab-org/gitlab-ci-multi-runner!386, gitlab-org/gitlab-ci-multi-runner#1434 See merge request !7474
2016-11-21Add Gitlab::Ci::Build::Credentials module with build credentials abstractionTomasz Maczukin
2016-11-21Merge branch 'grapify-project-snippet-api' into 'master' Rémy Coutable
Grapify the projects snippet API Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/22928 See merge request !7621
2016-11-21Merge branch 'smarter-cache-invalidation' into 'master' Sean McGivern
Smarter cache invalidation Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23550 See merge request !7360
2016-11-21Grapify the projects snippet APIRobert Schilling
2016-11-21Refactor cache refreshing/expiringYorick Peterse
This refactors repository caching so it's possible to selectively refresh certain caches, instead of just expiring and refreshing everything. To allow this the various methods that were cached (e.g. "tag_count" and "readme") use a similar pattern that makes expiring and refreshing their data much easier. In this new setup caches are refreshed as follows: 1. After a commit (but before running ProjectCacheWorker) we expire some basic caches such as the commit count and repository size. 2. ProjectCacheWorker will recalculate the commit count, repository size, then refresh a specific set of caches based on the list of files changed in a push payload. This requires a bunch of changes to the various methods that may be cached. For one, data should not be cached if a branch used or the entire repository does not exist. To prevent all these methods from handling this manually this is taken care of in Repository#cache_method_output. Some methods still manually check for the existence of a repository but this result is also cached. With selective flushing implemented ProjectCacheWorker no longer uses an exclusive lease for all of its work. Instead this worker only uses a lease to limit the number of times the repository size is updated as this is a fairly expensive operation.
2016-11-21Send credentials array with build dataTomasz Maczukin
2016-11-21Merge branch 'grapify-users-api' into 'master' Rémy Coutable
Grapify the users API Certain endpoints return different entities based on which user issues the request. Right now, I am not aware how to specify multiple entities as part of the description block of the endpoint. @rymai Do you know something about that. ## What are the relevant issue numbers? Related to #22928 See merge request !7147
2016-11-21Merge branch 'create-pipeline-endpoint' into 'master' Rémy Coutable
Add API endpoint for creating a pipeline Fixes #23468 See merge request !7209
2016-11-21Update some docs to reflect MWPS name changeGrzegorz Bizon
2016-11-21Grapify the users APIRobert Schilling
2016-11-19Add api endpoint for creating a pipelineIdo Leibovich
Add a new endpoint in the new API for creating a new pipeline, and return the details of that pipeline.
2016-11-18Merge branch 'zj-slash-commands-mattermost' into 'master' Kamil Trzciński
Slash command for mattermost Closes #22540 ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) See merge request !7438
2016-11-18Merge branch 'fix-tests-for-different-host' into 'master' Rémy Coutable
Use `Gitlab.config.gitlab.host` over `'localhost'` Use `Gitlab.config.gitlab.host` over `'localhost'` This would fix long standing failures running tests on my development machine, which set `Gitlab.config.gitlab.host` to another host because it's not my local computer. Now I finally cannot withstand it and decided to fix them once and for all. See merge request !7562
2016-11-18Merge branch ↵Rémy Coutable
'24599-spec-lib-gitlab-backend-shell_spec-rb-causes-other-specs-to-fail' into 'master' Resolve "spec/lib/gitlab/backend/shell_spec.rb causes other specs to fail" ## What does this MR do? It ensures we rely on `Gitlab::Shell`'s public API and not on its internal. Since `Gitlab::Shell` is caching the value of its token, the only way to get the correct token is to call `Gitlab::Shell.secret_token`, not to read the `Gitlab.config.gitlab_shell.secret_file` file! Fixes #24599 See merge request !7557
2016-11-18Rename mattermost_command to mattermost_slash_commandsKamil Trzcinski
2016-11-18Merge branch 'feature/cycle-analytics-events' into 'master' Douwe Maan
Cycle Analytics: Events per stage Adds list of events to each stage: - Issue: list of issues created in the last XX days, that have been labeled or added to a milestone. - Plan: list of commits that reference for the fist time an issue from the last stage. - Code: list of MR created in this stage - Test: List of unique builds triggered by the commits. - Review: List of MR merged - Staging: List of deployed builds - Production: list of issues with the time from idea to production Fixes #23449 - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6859
2016-11-18Use `Gitlab.config.gitlab.host` over `'localhost'`Lin Jen-Shin
This would fix long standing failures running tests on my development machine, which set `Gitlab.config.gitlab.host` to another host because it's not my local computer. Now I finally cannot withstand it and decided to fix them once and for all.
2016-11-18Return a consistent not found messageZ.J. van de Weg
This prevents leakage of project names on an endpoint which is unauthenticated and thus open to the world.
2016-11-18Rely on Gitlab::Shell public API, not reading internal files it may useRémy Coutable
It ensures we rely on `Gitlab::Shell`'s public API and not on its internal. Since `Gitlab::Shell` is caching the value of its token, the only way to get the correct token is to call `Gitlab::Shell.secret_token`, not to read the `Gitlab.config.gitlab_shell.secret_file` file! Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-18Improve style, add more testsZ.J. van de Weg
2016-11-18More coverage on service levelZ.J. van de Weg
2016-11-18Merge branch 'sort-api-groups' into 'master' Sean McGivern
Allow sorting groups in API Relates to #20013. See merge request !7529
2016-11-17Allow sorting groups in APISean McGivern
Allow `order_by` and `sort` parameters to `/api/v3/groups.json`. At present, only ordering by name and path is supported, and the default sort is name ascending (alphabetical order).
2016-11-17Remove default value for `project` argument on subscribable concernDouglas Barbosa Alexandre
2016-11-17added custom date helper and spec and fixed some unrelated spec failuresJames Lopez
2016-11-17Refactor all query config stuff into separate classes and added specsJames Lopez
2016-11-17 fix issue with commits and also updated routesJames Lopez
2016-11-17fix authorization of builds and added relevant specJames Lopez
2016-11-17fixed and added missing scenario to events integration specJames Lopez
2016-11-17refactored duplicated code in controller, updated JSON array naming and ↵James Lopez
fixed specs
2016-11-17fixed integration spec after big refactoring of fields per stageJames Lopez
2016-11-17added missing fields to issue. Also, added a light url builder to add URLs ↵James Lopez
easily from arel. Updated specs.
2016-11-17added pipelines to integration specJames Lopez
2016-11-17some more integration scenarios testing order. Also, fixed bug in the ↵James Lopez
staging and test stages.
2016-11-17added the rest of the stages to the controller and relevant specsJames Lopez
2016-11-17added cycle analytics events controller and started integration specJames Lopez
2016-11-17Merge branch 'fix/trace-patch-updated-at' into 'master' Kamil Trzciński
Update the updated_at of a build while patching the trace ## What does this MR do? Fixes build patching trace. It should update the `updated_at` field of a build to make sure it will not be removed by `stuck_ci_builds_worker`. ## Are there points in the code the reviewer needs to double check? Construction of a test for the bug. ## Why was this MR needed? Please read #22087 for a reference. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #22087 See merge request !7146
2016-11-16Merge branch '24496-fix-internal-api-project-lookup' into 'master' Sean McGivern
Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project paths Closes #24496 See merge request !7480
2016-11-16Merge branch 'adam-build-missing-services-when-necessary' into 'master' Douwe Maan
Defer saving project services to the database if there are no user changes ## What does this MR do? It defers saving project services to the database as long as it is possible. It creates a project service when creating a project only if this project service has an active template. After that project services are saved on the first edit. ## Are there points in the code the reviewer needs to double check? - tests that used `build_missing_services` before the change - number of queries executed ## Why was this MR needed? Motivation in #22281 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #22281 See merge request !6958
2016-11-16Merge branch '21992-disable-access-requests-by-default' into 'master' Robert Speicher
Disable the "request access" functionality by default for new groups and projects Currently this feature is enabled by default, and additional action is required to disable it. Closes #21992 Closes !7011 See merge request !7425
2016-11-16Fix POST /internal/allowed to cope with gitlab-shell v4.0.0 project pathsNick Thomas
gitlab-shell v3.6.6 would give project paths like so: * namespace/project gitlab-shell v4.0.0 can give project paths like so: * /namespace1/namespace2/project * /namespace/project * /path/to/repository/storage/namespace1/namespace2/project * /path/to/repository/storage/namespace/project
2016-11-16Merge branch 'fix_labels_api_adding_missing_parameter' into 'master' Sean McGivern
fix labels API adding missing parameter (current_user) See merge request !7458
2016-11-16Send registry_url with build data to GitLab RunnerTomasz Maczukin
2016-11-16Defer saving project services to the database if there are no user changesAdam Niedzielski
2016-11-15Merge branch '23584-triggering-builds-from-webhooks' into 'master' Rémy Coutable
Add ref parameter for triggering builds with gitlab webhook from other project. Currently GitLab can trigger builds from external tools like curl. But there is no way to trigger builds with webhook from another GitLab project. Executing webhook like `/projects/:id/trigger/builds?token=TOKEN&ref=master` results in such message from server: ``` 400 No builds created ``` Problem is the ref from request body takes precedence of the ref from query string. System tries to trigger build for nonexistent branch instead of `master`. This is the feature of the Grape framework used to build GitLab api. This MR adds optional `ref` parameter into the api url: ``` /projects/:id/ref/:ref/trigger/builds?token=TOKEN ``` This will lead that the ref in the url will have precedence of the ref inside request body. This solution provides compatibility with current API urls. Closes #23584 See merge request !7022