Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Correctly detect multiple issue URLs after 'Closes...' in MR descriptionsdm-closing-issue-urls | Douwe Maan | 2017-09-21 | 1 | -1/+1 |
| | |||||
* | Merge branch 'gitlab-git-popen' into 'master' | Douwe Maan | 2017-09-20 | 4 | -8/+14 |
|\ | | | | | | | | | | | | | Use Gitlab::Git's Popen on that module's code Closes gitaly#597 See merge request gitlab-org/gitlab-ce!14237 | ||||
| * | Use Gitlab::Git's Popen on that module's codegitlab-git-popen | Alejandro Rodríguez | 2017-09-20 | 4 | -8/+14 |
| | | | | | | | | | | This allows the current Gitaly migration to depend on less code outside of the Gitlab::Git module | ||||
* | | Merge branch '32796-tighten-up-remove-old-while-backing-up-gitlab' into 'master' | Rémy Coutable | 2017-09-20 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Tighten up remove_old regex from gitlab backup manager. Closes #32796 See merge request gitlab-org/gitlab-ce!14333 | ||||
| * | | Tighten up remove_old regex from gitlab backup manager.32796-tighten-up-remove-old-while-backing-up-gitlab | Tiago Botelho | 2017-09-20 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '37713-enable-ee_compat_check-for-forks' into 'master' | Rémy Coutable | 2017-09-20 | 2 | -2/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Enable ee_compat_check for forks, but not EE Closes #37713 See merge request gitlab-org/gitlab-ce!14189 | ||||
| * | | | Update ee_compat_check for community contributors37713-enable-ee_compat_check-for-forks | Lin Jen-Shin | 2017-09-15 | 1 | -1/+6 |
| | | | | |||||
| * | | | Enable ee_compat_check for forks, but not EE | Lin Jen-Shin | 2017-09-15 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | We exclude known EE projects, and check the project directory name for EE forks. | ||||
* | | | | Fix rewriting issue references with group milestones | Grzegorz Bizon | 2017-09-20 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge branch '20049-projects-api-forks' into 'master' | Rémy Coutable | 2017-09-20 | 1 | -4/+19 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Resolve "make project data via API report forks of this project" Closes #20049 See merge request gitlab-org/gitlab-ce!14355 | ||||
| * | | | Add an API endpoint to determine the forks of a project | Mark Fletcher | 2017-09-20 | 1 | -4/+19 |
| | | | | |||||
* | | | | Merge branch 'fix/gitaly-commit-diff-rpc-encoding-error' into 'master' | Robert Speicher | 2017-09-20 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode paths properly for Gitaly Commit{Diff,Delta} Closes gitaly#589 See merge request gitlab-org/gitlab-ce!14361 | ||||
| * | | | | Encode paths properly for Gitaly Commit{Diff,Delta}fix/gitaly-commit-diff-rpc-encoding-error | Ahmad Sherif | 2017-09-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Fixes gitaly#589 | ||||
* | | | | | Prepare cherry-pick and revert for migration to Gitaly | Jacob Vosmaer (GitLab) | 2017-09-19 | 4 | -4/+98 |
| | | | | | |||||
* | | | | | Merge branch 'backstage/gb/jobs-triggering-policy-specifications' into 'master' | Kamil Trzciński | 2017-09-19 | 5 | -92/+130 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement job policy specifications Closes #37280 See merge request gitlab-org/gitlab-ce!14265 | ||||
| * | | | | | Raise exception when initializing unknown policy | Grzegorz Bizon | 2017-09-18 | 1 | -5/+1 |
| | | | | | | |||||
| * | | | | | Do not initialize YAML processor with project full path | Grzegorz Bizon | 2017-09-18 | 1 | -3/+2 |
| | | | | | | |||||
| * | | | | | Do not pass project path from YAML processor | Grzegorz Bizon | 2017-09-18 | 4 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | Use project full path that can be received from a pipeline object | ||||
| * | | | | | Simplify pipeline source policy pattern matching | Grzegorz Bizon | 2017-09-18 | 1 | -9/+2 |
| | | | | | | |||||
| * | | | | | Add specs for CI/CD job policy refs specification | Grzegorz Bizon | 2017-09-18 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fix Rubocop offenses in YAML processor classes | Grzegorz Bizon | 2017-09-18 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Remove YAML processor refactoring stubs and fix specs | Grzegorz Bizon | 2017-09-18 | 2 | -32/+26 |
| | | | | | | |||||
| * | | | | | Extract job refs policy specs into separate class | Grzegorz Bizon | 2017-09-18 | 2 | -66/+59 |
| | | | | | | |||||
| * | | | | | Use CI/CD job policy specification in YAML processor | Grzegorz Bizon | 2017-09-18 | 3 | -9/+26 |
| | | | | | | |||||
| * | | | | | Implement CI/CD kubernetes policy specification | Grzegorz Bizon | 2017-09-18 | 2 | -0/+47 |
| | | | | | | |||||
* | | | | | | Merge branch '37999-fix-circuit-breaker' into 'master' | Douwe Maan | 2017-09-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the filesystem shard health check to check all configured shards Closes #37999 See merge request gitlab-org/gitlab-ce!14341 | ||||
| * | | | | | Fix the filesystem shard health check to check all configured shards | Nick Thomas | 2017-09-19 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Detect n+1 issues involving Gitaly | Andrew Newdigate | 2017-09-19 | 5 | -14/+171 |
| | | | | | |||||
* | | | | | Merge branch 'sh-project-feature-eager-load' into 'master' | Yorick Peterse | 2017-09-19 | 1 | -1/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate N+1 queries referencing issues Closes #38033 See merge request gitlab-org/gitlab-ce!14349 | ||||
| * | | | | | Eliminate N+1 queries referencing issuessh-project-feature-eager-load | Stan Hu | 2017-09-18 | 1 | -1/+2 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To load issue 1, we see that in #38033 that about 835 ms of the SQL queries were due to loading ProjectFeature. We should be able to cut this down by eagerly loading this information. Closes #38033 | ||||
* | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master' | Douwe Maan | 2017-09-19 | 1 | -1/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Port of EE translations Closes #37914 See merge request gitlab-org/gitlab-ce!14340 | ||||
| * | | | | Add Dutch as an available language. | Bob Van Landuyt | 2017-09-18 | 1 | -1/+2 |
| |/ / / | |||||
* | | | | fix #35290 Make read-only API for public merge requests available without ↵ | haseeb | 2017-09-18 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | authentication | ||||
* | | | | Merge branch 'add_closed_at_attribute' into 'master' | Rémy Coutable | 2017-09-18 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'closed_at' attribute to Issues API Closes #5935 See merge request gitlab-org/gitlab-ce!14316 | ||||
| * | | | | Add 'closed_at' attribute to Issues API | Vitaliy @blackst0ne Klachkov | 2017-09-16 | 1 | -0/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch '37789-followup-for-read-registry-change' into 'master' | Rémy Coutable | 2017-09-18 | 1 | -7/+17 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Clean up read_registry scope changes Closes #37789 See merge request gitlab-org/gitlab-ce!14307 | ||||
| * | | | Clean up read_registry scope changes | Robin Bobbitt | 2017-09-18 | 1 | -7/+17 |
| |/ / | | | | | | | | | | Closes #37789 | ||||
* | | | Merge branch 'operation-service-merge' into 'master' | Rémy Coutable | 2017-09-18 | 2 | -1/+43 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Prepare Repository#merge for migration to Gitaly Closes gitaly#559 See merge request gitlab-org/gitlab-ce!14154 | ||||
| * | | | Prepare Repository#merge for migration to Gitalyoperation-service-merge | Jacob Vosmaer | 2017-09-15 | 2 | -1/+43 |
| |/ / | |||||
* | | | Merge branch 'mk-delete-conflicting-redirects-mysql' into 'master' | Douwe Maan | 2017-09-18 | 2 | -0/+129 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Clean up redirect routes that conflict with regular routes Closes #36229 See merge request gitlab-org/gitlab-ce!13783 | ||||
| * | | | Spread out the work a little | Michael Kozono | 2017-09-14 | 1 | -3/+43 |
| | | | | |||||
| * | | | Extract helper for queuing background jobs | Michael Kozono | 2017-09-14 | 1 | -0/+48 |
| | | | | |||||
| * | | | Simplify query | Michael Kozono | 2017-09-14 | 1 | -15/+4 |
| | | | | | | | | | | | | | | | | Performance does not need to be optimized in this case because this will be run in batches at a controlled rate. | ||||
| * | | | Add specs for deleting conflicting redirects | Michael Kozono | 2017-09-14 | 1 | -2/+2 |
| | | | | |||||
| * | | | Delete conflicting redirects in background | Michael Kozono | 2017-09-14 | 1 | -0/+52 |
| |/ / | |||||
* | | | Ensure we use `Entities::User` for non-admin `users/:id` API requests | Robert Speicher | 2017-09-15 | 1 | -1/+1 |
| | | | |||||
* | | | Fix setting share_with_group_lockfix-share-with-group-lock-update | Yorick Peterse | 2017-09-15 | 2 | -3/+28 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit running Namespace#force_share_with_group_lock_on_descendants would result in updating _all_ namespaces in the namespaces table, not just the descendants. This is the result of ActiveRecord::Relation#update_all not taking into account the CTE. To work around this we use the CTE query as a sub-query instead of directly calling #update_all. To prevent this from happening the relations returned by Gitlab::GroupHierarchy are now marked as read-only, resulting in an error being raised when methods such as #update_all are used. Fortunately on GitLab.com our statement timeouts appear to have prevented this query from actually doing any damage other than causing a very large amount of dead tuples. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37916 | ||||
* | | Merge branch 'gitlab-git-user' into 'master' | Rémy Coutable | 2017-09-14 | 3 | -18/+24 |
|\ \ | | | | | | | | | | | | | Rename Gitlab::Git::Committer to User See merge request gitlab-org/gitlab-ce!14254 | ||||
| * | | Rename Gitlab::Git::Committer to User | Jacob Vosmaer | 2017-09-14 | 3 | -18/+24 |
| | | | |||||
* | | | Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master' | Grzegorz Bizon | 2017-09-14 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't force the encoding of the OAuth provider in Gitlab::OAuth::AuthHash#provider Closes #37845 See merge request gitlab-org/gitlab-ce!14263 |