Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Expand truncated Bitbucket pull request source/target SHA if possible | Douwe Maan | 2017-09-25 | 1 | -2/+7 |
| | |||||
* | Merge branch '38280-undefined-run_command-when-running-rake-gitlab-check' ↵ | Douwe Maan | 2017-09-25 | 2 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | into 'master' Resolve "Undefined run_command when running rake gitlab:check" Closes #38280 See merge request gitlab-org/gitlab-ce!14469 | ||||
| * | Fixed few gitlab:check tasks that were failing with exception38280-undefined-run_command-when-running-rake-gitlab-check | Gabriel Mazetto | 2017-09-25 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'rs-allow-name-on-anchors' into 'master' | Douwe Maan | 2017-09-25 | 1 | -1/+2 |
|\ \ | |/ |/| | | | | | | | | | Re-allow `name` attribute on user-provided anchor HTML Closes #38196 See merge request gitlab-org/gitlab-ce!14452 | ||||
| * | Re-allow `name` attribute on user-provided anchor HTML | Robert Speicher | 2017-09-22 | 1 | -1/+2 |
| | | |||||
* | | Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master' | Douwe Maan | 2017-09-22 | 5 | -10/+72 |
|\ \ | | | | | | | | | | | | | | | | | | | Allow the git circuit breaker to correctly handle missing repository storages Closes #36549 See merge request gitlab-org/gitlab-ce!14417 | ||||
| * | | Allow the git circuit breaker to correctly handle missing repository storages | Nick Thomas | 2017-09-22 | 5 | -10/+72 |
| | | | |||||
* | | | Workaround for #38259 | Andrew Newdigate | 2017-09-22 | 1 | -2/+5 |
| |/ |/| | |||||
* | | Merge branch 'feature/migrate-repository-diff' into 'master' | Douwe Maan | 2017-09-22 | 4 | -15/+60 |
|\ \ | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#diff to Gitaly Closes gitaly#524 See merge request gitlab-org/gitlab-ce!14251 | ||||
| * | | Migrate Gitlab::Git::Repository#diff to Gitalyfeature/migrate-repository-diff | Ahmad Sherif | 2017-09-21 | 4 | -15/+60 |
| | | | | | | | | | | | | Closes gitaly#524 | ||||
* | | | Merge branch '38197-fix-ImapAuthenticationCheck' into 'master' | Douwe Maan | 2017-09-22 | 1 | -17/+28 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix `rake gitlab:incoming_email:check` Closes #38197 See merge request gitlab-org/gitlab-ce!14423 | ||||
| * | | | Fix rake gitlab:incoming_email:check and make it38197-fix-ImapAuthenticationCheck | Lin Jen-Shin | 2017-09-22 | 1 | -17/+28 |
| | | | | | | | | | | | | | | | | report error properly, so that we know what's really wrong. | ||||
* | | | | Merge branch '33328-usage-ping-for-gitlab-features-and-components' into 'master' | Rémy Coutable | 2017-09-22 | 1 | -10/+36 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds gitlab features and components to usage ping data. Closes #33328 See merge request gitlab-org/gitlab-ce!14305 | ||||
| * | | | | Adds gitlab features and components to usage ping data.33328-usage-ping-for-gitlab-features-and-components | Tiago Botelho | 2017-09-21 | 1 | -10/+36 |
| | | | | | |||||
* | | | | | Merge branch 'sh-blob-raw-check' into 'master' | Douwe Maan | 2017-09-22 | 1 | -0/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Ensure that Blob.raw returns always returns a valid blob object See merge request gitlab-org/gitlab-ce!14412 | ||||
| * | | | | Ensure that Blob.raw returns always returns a valid blob objectsh-blob-raw-check | Stan Hu | 2017-09-21 | 1 | -0/+2 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | In gitlab-org/gitlab-ee!2976, we saw that a given OID could point to a commit, which would cause the delta size check to fail. Gitaly already returns nil if the OID isn't a blob, so this change makes the Rugged implementation consistent. | ||||
* | | | | Resolve "Better SVG Usage in the Frontend" | Tim Zallmann | 2017-09-22 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'fix-multi-line-hook-output' into 'master' | Rémy Coutable | 2017-09-22 | 1 | -3/+4 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Display full pre-receive and post-receive hook output in GitLab UI Closes #25214 See merge request gitlab-org/gitlab-ce!14222 | ||||
| * | | | Display full pre-receive and post-receive hook output in GitLab UI | Robin Bobbitt | 2017-09-21 | 1 | -3/+4 |
| |/ / | |||||
* | | | Merge branch 'bvl-transient-failure-health-controller-spec' into 'master' | Douwe Maan | 2017-09-21 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't memoize storage configuration on `FsShardsCheck` Closes #38140 See merge request gitlab-org/gitlab-ce!14419 | ||||
| * | | | Don't memoize storage configuration on `FsShardsCheck`bvl-transient-failure-health-controller-spec | Bob Van Landuyt | 2017-09-21 | 1 | -2/+2 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | These values are already coming from memory, so we don't need to memoize. If we do memoize these, than the would not be stubbed when calling `stub_storage_settings` in specs | ||||
* | | | Merge branch 'dm-closing-issue-urls' into 'master' | Robert Speicher | 2017-09-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Correctly detect multiple issue URLs after 'Closes...' in MR descriptions Closes #33745 See merge request gitlab-org/gitlab-ce!14411 | ||||
| * | | | Correctly detect multiple issue URLs after 'Closes...' in MR descriptionsdm-closing-issue-urls | Douwe Maan | 2017-09-21 | 1 | -1/+1 |
| |/ / | |||||
* | | | Adds EE tag detection to remove_old in gitlab backup. | Tiago Botelho | 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 |
| | |/ / / | |/| | | |