Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix closing braces in YAML processor specsbackstage/gb/jobs-triggering-policy-specifications | Grzegorz Bizon | 2017-09-19 | 1 | -1/+2 |
| | |||||
* | Raise exception when initializing unknown policy | Grzegorz Bizon | 2017-09-18 | 1 | -5/+2 |
| | |||||
* | Use parentheses in CI/CD kubernetes policy specs | Grzegorz Bizon | 2017-09-18 | 1 | -1/+1 |
| | |||||
* | Do not initialize YAML processor with project full path | Grzegorz Bizon | 2017-09-18 | 1 | -60/+59 |
| | |||||
* | Do not pass project path from YAML processor | Grzegorz Bizon | 2017-09-18 | 2 | -12/+27 |
| | | | | Use project full path that can be received from a pipeline object | ||||
* | Add specs for CI/CD job policy refs specification | Grzegorz Bizon | 2017-09-18 | 1 | -0/+87 |
| | |||||
* | Add specs for CI/CD job policy factory method | Grzegorz Bizon | 2017-09-18 | 1 | -0/+40 |
| | |||||
* | Fix Rubocop offenses in YAML processor classes | Grzegorz Bizon | 2017-09-18 | 1 | -1/+1 |
| | |||||
* | Remove YAML processor refactoring stubs and fix specs | Grzegorz Bizon | 2017-09-18 | 1 | -53/+55 |
| | |||||
* | Implement CI/CD kubernetes policy specification | Grzegorz Bizon | 2017-09-18 | 1 | -0/+30 |
| | |||||
* | Merge branch 'operation-service-merge' into 'master' | Rémy Coutable | 2017-09-18 | 1 | -9/+1 |
|\ | | | | | | | | | | | | | 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 | 1 | -9/+1 |
| | | |||||
* | | Merge branch 'mk-delete-conflicting-redirects-mysql' into 'master' | Douwe Maan | 2017-09-18 | 2 | -0/+162 |
|\ \ | | | | | | | | | | | | | | | | | | | 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 | -6/+66 |
| | | | |||||
| * | | Extract helper for queuing background jobs | Michael Kozono | 2017-09-14 | 1 | -0/+62 |
| | | | |||||
| * | | Add specs for deleting conflicting redirects | Michael Kozono | 2017-09-14 | 1 | -0/+40 |
| |/ | |||||
* | | Fix setting share_with_group_lockfix-share-with-group-lock-update | Yorick Peterse | 2017-09-15 | 1 | -0/+15 |
|/ | | | | | | | | | | | | | | | | | | | 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 | 2 | -5/+5 |
|\ | | | | | | | | | 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 | 2 | -5/+5 |
| | | |||||
* | | Don't force the encoding of the OAuth provider in ↵37845-fix-oauth-provider-forced-encoding | Rémy Coutable | 2017-09-14 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::OAuth::AuthHash#provider Some providers freeze their name (e.g. https://github.com/zquestz/omniauth-google-oauth2/blob/414c43ef3ffec37d473321f262e80f1e46dda89f/lib/omniauth/strategies/google_oauth2.rb#L1), so trying to modify the string would fail with a `can't modify frozen String` exception (see https://gitlab.com/gitlab-org/gitlab-ce/issues/37845#note_40308148). In this case, we can just stop trying to force the encoding of the provider name as they should always be in utf8 by default. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master' | Rémy Coutable | 2017-09-13 | 1 | -0/+9 |
|\ \ | |/ |/| | | | | | Backport more EE changes to Gitlab::UrlSanitizer See merge request !14150 | ||||
| * | Backport more EE changes to Gitlab::UrlSanitizer | Nick Thomas | 2017-09-11 | 1 | -0/+9 |
| | | |||||
* | | Merge branch ↵ | Douwe Maan | 2017-09-13 | 1 | -0/+14 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '37629-lazy-image-loading-breaks-notification-mails-for-an-added-screenshot' into 'master' Resolve "Lazy image loading breaks notification mails for an added screenshot" Closes #37629 See merge request !14161 | ||||
| * | | Remove ImageLazyLoadFilter from EmailPipeline37629-lazy-image-loading-breaks-notification-mails-for-an-added-screenshot | Robert Speicher | 2017-09-12 | 1 | -0/+14 |
| | | | |||||
* | | | Merge branch 'zj-usage-data-auto-devops' into 'master' | Kamil Trzciński | 2017-09-13 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add usage ping for Auto DevOps Closes #37648 See merge request !14162 | ||||
| * | | | Add auto devops enabled/disabled to usage ping | Zeger-Jan van de Weg | 2017-09-12 | 1 | -0/+2 |
| | | | | |||||
| * | | | Add usage ping for Auto DevOps | Zeger-Jan van de Weg | 2017-09-08 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#37648 | ||||
* | | | | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master' | Grzegorz Bizon | 2017-09-13 | 6 | -1702/+1704 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Move `lib/ci` to `lib/gitlab/ci`" Closes #5836 See merge request !14078 | ||||
| * | | | | adds changelog | Maxim Rydkin | 2017-09-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix CI fix CI | ||||
| * | | | | move `lib/ci/mask_secret.rb` into `lib/gitlab/ci/mask_secret.rb` | Maxim Rydkin | 2017-09-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb` | Maxim Rydkin | 2017-09-12 | 2 | -1697/+1699 |
| | | | | | |||||
| * | | | | move `lib/ci/charts.rb` into `lib/gitlab/ci/charts.rb` | Maxim Rydkin | 2017-09-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | move `lib/ci/ansi2html.rb` into `lib/gitlab/ci/ansi2html.rb` | Maxim Rydkin | 2017-09-12 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'revert-2f46c3a8' into 'master' | Robert Speicher | 2017-09-12 | 2 | -2/+58 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Revert "Merge branch 'revert-f2421b2b' into 'master'" See merge request !14190 | ||||
| * | | | | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8 | Annabel Dunstone Gray | 2017-09-11 | 2 | -2/+58 |
| | |_|/ | |/| | | | | | | This reverts merge request !14148 | ||||
* | | | | Merge branch 'gitaly-519-commit-stats' into 'master' | Robert Speicher | 2017-09-12 | 2 | -1/+34 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Migrate Git::CommitStats to Gitaly Closes gitaly#519 See merge request !14077 | ||||
| * | | | Migrate Git::CommitStats to Gitalygitaly-519-commit-stats | Kim "BKC" Carlbäcker | 2017-09-11 | 2 | -1/+34 |
| |/ / | |||||
* | | | Resolve "Error 500 in non-UTF8 branch names" | Micael Bergeron | 2017-09-12 | 2 | -1/+10 |
| | | | |||||
* | | | Merge branch 'detect-orphaned-repositories' into 'master' | Douwe Maan | 2017-09-12 | 2 | -0/+129 |
|\ \ \ | | | | | | | | | | | | | | | | | Detect orphaned repositories See merge request !14204 | ||||
| * | | | Refactor on namespace and repository checks and added specs | Gabriel Mazetto | 2017-09-12 | 2 | -0/+129 |
| |/ / | |||||
* | | | Merge branch 'hide-read-registry-scope-when-registry-disabled' into 'master' | Kamil Trzciński | 2017-09-12 | 1 | -6/+32 |
|\ \ \ | |/ / |/| | | | | | | | | Hide read_registry scope when registry is disabled on instance See merge request !13314 | ||||
| * | | Hide read_registry scope when registry is disabled on instance | Robin Bobbitt | 2017-08-21 | 1 | -6/+32 |
| | | | |||||
* | | | Revert "Merge branch ↵revert-f2421b2b | Rubén Dávila | 2017-09-08 | 2 | -58/+2 |
| | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619 | ||||
* | | | Merge branch 'rs-issue-36104' into 'security-9-5' | Douwe Maan | 2017-09-07 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | [9.5] Disallow the `name` attribute on all user-provided markup See merge request gitlab/gitlabhq!2166 | ||||
* | | | Merge branch 'rs-issue-36098' into 'security-9-5' | Robert Speicher | 2017-09-07 | 1 | -3/+17 |
| | | | | | | | | | | | | | | | [9.5] Limit `style` attribute on `th` and `td` elements to specific properties See merge request gitlab/gitlabhq!2155 | ||||
* | | | Merge branch 'dm-go-get-xss' into 'security-9-3' | Robert Speicher | 2017-09-07 | 1 | -1/+17 |
| |/ |/| | | | | | | | Fix XSS issue in go-get handling See merge request !2128 | ||||
* | | Merge branch ↵ | Douwe Maan | 2017-09-07 | 1 | -0/+12 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '35558-only-one-garbage-collection-should-be-running-per-project-at-once' into 'master' Adds exclusive lease to Git garbage collect worker. Closes #35558 See merge request !14036 | ||||
| * | | Adds exclusive lease to Git garbage collect worker.35558-only-one-garbage-collection-should-be-running-per-project-at-once | Tiago Botelho | 2017-09-07 | 1 | -0/+12 |
| | | | |||||
* | | | Gitaly feature toggles are on by default in development environments | Andrew Newdigate | 2017-09-07 | 1 | -0/+16 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2017-09-07 | 5 | -96/+61 |
|\ \ \ | | | | | | | | | | | | | zj/gitlab-ce-zj-auto-devops-table |