Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'qa-ml-fix-push-file-size-test' into 'master'button-arrangement | Dan Davison | 2019-03-29 | 1 | -2/+3 |
|\ | |||||
| * | Fix push file size testqa-ml-fix-push-file-size-test | Mark Lapierre | 2019-03-28 | 1 | -2/+3 |
* | | Merge branch 'leipert-hotfix-ci-yml' into 'master' | Stan Hu | 2019-03-29 | 1 | -7/+7 |
|\ \ | |||||
| * | | Fix GitLab CI branch matching pattern | Lukas Eipert | 2019-03-29 | 1 | -7/+7 |
* | | | Merge branch 'dennis-positioning-important' into 'master' | Clement Ho | 2019-03-29 | 1 | -4/+4 |
|\ \ \ | |||||
| * | | | Designate common positioning classes as important a la Bootstrapdennis-positioning-important | Dennis Tang | 2019-03-26 | 1 | -4/+4 |
* | | | | Merge branch 'docs/zj-patch-json' into 'master' | Nick Thomas | 2019-03-29 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Use valid data in our GetCommit example responsedocs/zj-patch-json | Zeger-Jan van de Weg | 2019-03-29 | 1 | -2/+2 |
* | | | | | Merge branch 'rename-cluster-managed-method' into 'master' | Douglas Barbosa Alexandre | 2019-03-29 | 12 | -26/+137 |
|\ \ \ \ \ | |||||
| * | | | | | Renames Cluster#managed? to provided_by_user? | Mayra Cabrera | 2019-03-29 | 12 | -26/+137 |
|/ / / / / | |||||
* | | | | | Merge branch 'update-contribution-closing-policy' into 'master' | Marcia Ramos | 2019-03-29 | 1 | -2/+5 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Docs: Update contribution closing policy to include community attribution | Lucas Charles | 2019-03-29 | 1 | -2/+5 |
* | | | | | Merge branch 'winh-jest-html-fixtures' into 'master' | Clement Ho | 2019-03-29 | 4 | -10/+47 |
|\ \ \ \ \ | |||||
| * | | | | | Add Karma-style fixture helpers to Jestwinh-jest-html-fixtures | Winnie Hellmann | 2019-03-29 | 3 | -2/+17 |
| * | | | | | Add helpers for HTML fixtures to Jest | Winnie Hellmann | 2019-03-29 | 1 | -6/+20 |
| * | | | | | Add workaround for innerText in Jest | Winnie Hellmann | 2019-03-29 | 1 | -0/+9 |
| * | | | | | Move abuse_reports_spec.js to Jest | Winnie Hellmann | 2019-03-29 | 1 | -2/+2 |
* | | | | | | Merge branch 'docs-ci-deprecated-variables' into 'master' | Mike Lewis | 2019-03-29 | 2 | -30/+32 |
|\ \ \ \ \ \ | |||||
| * | | | | | | New doc - deprecated variablesdocs-ci-deprecated-variables | Marcia Ramos | 2019-03-28 | 2 | -30/+32 |
* | | | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master' | Clement Ho | 2019-03-29 | 2 | -5/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update dependency @gitlab/svgs to ^1.57.0 | Lukas 'Eipi' Eipert | 2019-03-29 | 2 | -5/+5 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch '58971-sentry-api-keyerror' into 'master'57970-i18n-linters-eslint-js | Sean McGivern | 2019-03-29 | 8 | -31/+163 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Handle missing keys in sentry api response | Reuben Pereira | 2019-03-29 | 8 | -31/+163 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '50199-quick-actions-refactor' into 'master' | Sean McGivern | 2019-03-29 | 50 | -1069/+3128 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Extend quick actions dsl50199-quick-actions-refactor | Alexandru Croitor | 2019-03-29 | 50 | -1069/+3128 |
* | | | | | | | | Merge branch '59569-some-steps-are-missed-during-review-apps-deployments' int... | Robert Speicher | 2019-03-29 | 1 | -125/+161 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add more logging in the Review Apps deployment steps59569-some-steps-are-missed-during-review-apps-deployments | Rémy Coutable | 2019-03-28 | 1 | -125/+161 |
* | | | | | | | | Merge branch '59462-applicatonsettings-not-tolerant-of-missing-db-columns' in... | Stan Hu | 2019-03-29 | 2 | -4/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Apply suggestion to spec/lib/gitlab/current_settings_spec.rb59462-applicatonsettings-not-tolerant-of-missing-db-columns | Lin Jen-Shin | 2019-03-28 | 1 | -1/+1 |
| * | | | | | | | | Use a Gitlab::FakeApplicationSettings when migrations are pending | Rémy Coutable | 2019-03-26 | 2 | -3/+12 |
* | | | | | | | | | Merge branch 'ce-1607-elastic_feature_flag_per_group' into 'master' | Nick Thomas | 2019-03-29 | 5 | -2/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Backport of 1607-elastic_feature_flag_per_groupce-1607-elastic_feature_flag_per_group | Mario de la Ossa | 2019-03-28 | 5 | -2/+4 |
* | | | | | | | | | | Merge branch 'winh-jest-vue-tips' into 'master' | Tim Zallmann | 2019-03-29 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Disable Vue tips when running Jestwinh-jest-vue-tips | Winnie Hellmann | 2019-03-28 | 1 | -0/+3 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'persist-fulll-ref-path-for-mr-pipelines' into 'master' | Kamil Trzciński | 2019-03-29 | 21 | -31/+354 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Create detached merge request pipelinespersist-fulll-ref-path-for-mr-pipelines | Shinya Maeda | 2019-03-29 | 21 | -31/+354 |
* | | | | | | | | | | Merge branch 'refactor/ce_stubbed_worker' into 'master' | Douwe Maan | 2019-03-29 | 7 | -76/+49 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Refactor subbed_worker callsrefactor/ce_stubbed_worker | João Cunha | 2019-03-28 | 7 | -76/+49 |
* | | | | | | | | | | | Merge branch 'sh-fix-gitaly-find-commit-caching' into 'master' | Kamil Trzciński | 2019-03-29 | 8 | -14/+70 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Guard against nested allows with ref name cachingsh-fix-gitaly-find-commit-caching | Stan Hu | 2019-03-27 | 2 | -1/+2 |
| * | | | | | | | | | | Allow ref name caching CommitService#find_commit | Stan Hu | 2019-03-27 | 8 | -14/+69 |
* | | | | | | | | | | | Merge branch 'add-pluck-primary-key' into 'master' | Robert Speicher | 2019-03-29 | 154 | -164/+169 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Add a thin encapsulation around .pluck(:id) | Nick Thomas | 2019-03-28 | 5 | -14/+19 |
| * | | | | | | | | | | | Inherit from ApplicationRecord instead of ActiveRecord::Base | Nick Thomas | 2019-03-28 | 149 | -150/+150 |
* | | | | | | | | | | | | Merge branch 'winh-jest-gon' into 'master' | Filipa Lacerda | 2019-03-29 | 5 | -6/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Set gon.ee in Jestwinh-jest-gon | Winnie Hellmann | 2019-03-28 | 2 | -9/+10 |
| * | | | | | | | | | | | | Ignore Jest config from ESLint | Winnie Hellmann | 2019-03-28 | 2 | -1/+10 |
| * | | | | | | | | | | | | Extract IS_EE config helper | Winnie Hellmann | 2019-03-28 | 2 | -5/+10 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch '10735-geo-gitlab-revision-can-return-not-consistent-results' in... | Sean McGivern | 2019-03-29 | 3 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Use a fixed git abbrev parameter when we fetch a git revision10735-geo-gitlab-revision-can-return-not-consistent-results | Valery Sizov | 2019-03-28 | 3 | -2/+7 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | |