summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Run mysql specs on feature branches again52442-schedule-mysql-on-feature-branchesNick Thomas2019-05-241-25/+0
|
* Merge branch '62151-broken-master' into 'master'Kamil Trzciński2019-05-2418-67/+336
|\ | | | | | | | | | | | | Fix MySQL CI jobs Closes #62156 and #62151 See merge request gitlab-org/gitlab-ce!28593
| * Document the on-demand run of MySQL tests62151-broken-masterRémy Coutable2019-05-221-12/+22
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Fix MySQL CI jobsRémy Coutable2019-05-222-8/+28
| | | | | | | | | | | | [run mysql] Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Revert "Merge branch 'revert-04c3c6dd' into 'master'"Rémy Coutable2019-05-2217-47/+286
| | | | | | | | | | This reverts commit 744f1f2e7037f5c70c3168d9e2e89b1c327465d2, reversing changes made to c4d930e5f54e7da07c80cc028dfc0f5c08719146.
* | Merge branch 'ce-jej/group-saml-cleans-up-identity' into 'master'Mayra Cabrera2019-05-241-0/+1
|\ \ | | | | | | | | | | | | Adds Identity#for_user for use in an EE MR See merge request gitlab-org/gitlab-ce!28697
| * | Adds Identity#for_user for use in an EE MRce-jej/group-saml-cleans-up-identityJames Edwards-Jones2019-05-241-0/+1
| | |
* | | Merge branch '62283-fix-job-app-spec' into 'master'Filipa Lacerda2019-05-241-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replaces a hard-coded date in the job app spec Closes #62283 See merge request gitlab-org/gitlab-ce!28709
| * | | Replaces a hard-coded date in the job app specsamdbeckham2019-05-241-1/+4
| | | |
* | | | Merge branch 'add-mem-profiler' into 'master'Stan Hu2019-05-242-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add `memory_profiler` and `derailed_benchmarks` See merge request gitlab-org/gitlab-ce!28698
| * | | | Add `memory_profiler` and `derailed_benchmarks`add-mem-profilerKamil Trzciński2019-05-242-0/+14
| | | | |
* | | | | Merge branch 'winh-copy_metadata-description' into 'master'Mayra Cabrera2019-05-243-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clarify that /copy_metadata only works within same project See merge request gitlab-org/gitlab-ce!28671
| * | | | | Clarify that /copy_metadata only works within same projectWinnie Hellmann2019-05-243-3/+3
|/ / / / /
* | | | | Merge branch 'vue-repo-list-backend-frontend' into 'master'Filipa Lacerda2019-05-2413-87/+253
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Pull files for repository tree from GraphQL API See merge request gitlab-org/gitlab-ce!28638
| * | | | | Pull files for repository tree from GraphQL APIPhil Hughes2019-05-2413-87/+253
| | | | | |
* | | | | | Merge branch '60778-input-text-height' into 'master'Filipa Lacerda2019-05-243-0/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix height of input groups Closes #61304, #61303, #59254, and #60778 See merge request gitlab-org/gitlab-ce!28495
| * | | | | Fix height of input groups60778-input-text-heightAnnabel Dunstone Gray2019-05-203-0/+10
| | | | | |
* | | | | | Merge branch 'ce-jej/unflag-group-saml-metadata' into 'master'Douwe Maan2019-05-241-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group SAML docs explain metadata configuration See merge request gitlab-org/gitlab-ce!28700
| * | | | | | Group SAML docs explain metadata configurationce-jej/unflag-group-saml-metadataJames Edwards-Jones2019-05-241-1/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-milestone-references-with-escaped-html-entities' into 'master'Jan Provaznik2019-05-245-10/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix milestone references with HTML entities in the name Closes #62114 See merge request gitlab-org/gitlab-ce!28667
| * | | | | | Fix milestone references with HTML entities in the namefix-milestone-references-with-escaped-html-entitiesSean McGivern2019-05-245-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a milestone name contained an HTML entity that would be escaped (&, <, >), then it wasn't possible to refer to this milestone by name, or use it in a quick action. This already worked for labels, but not for milestones. We take care to re-escape un-matched milestones, too.
* | | | | | | Merge branch 'kp-add-graphql-full-config-support' into 'master'Phil Hughes2019-05-241-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for second `config` param in GraphQL wrapper lib See merge request gitlab-org/gitlab-ce!28705
| * | | | | | | Add support for second `config` paramkp-add-graphql-full-config-supportKushal Pandya2019-05-241-4/+4
|/ / / / / / /
* | | | | | | Merge branch '61827-prevent-user-popover-icon-shrink' into 'master'Filipa Lacerda2019-05-242-3/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent icons from shrinking in User popover when contents exceed container Closes #61827 See merge request gitlab-org/gitlab-ce!28696
| * | | | | | | Prevent icons from shrinking in User popover when contents exceed containerKushal Pandya2019-05-242-3/+12
|/ / / / / / /
* | | | | | | Merge branch 'vrt-mr-update-ce-backport' into 'master'Phil Hughes2019-05-243-16/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conformance MR for Update Visual Review Toolbar to post to MRs See merge request gitlab-org/gitlab-ce!28687
| * | | | | | | Add changes to match eevrt-mr-update-ce-backportsarahghp2019-05-233-16/+18
| | | | | | | |
* | | | | | | | Merge branch '38561-border-radii' into 'master'Phil Hughes2019-05-244-1/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix border radii on diff files and repo files Closes #38483 and #38561 See merge request gitlab-org/gitlab-ce!28675
| * | | | | | | | Fix border radii on diff files and repo files38561-border-radiiAnnabel Dunstone Gray2019-05-234-1/+14
| | | | | | | | |
* | | | | | | | | Merge branch 'style-avatar-component' into 'master'Kushal Pandya2019-05-244-38/+41
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style avatar component Closes gitlab-ui#252 See merge request gitlab-org/gitlab-ce!28399
| * | | | | | | | | Move avatar related styles to components directoryJacques Erasmus2019-05-244-38/+41
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved all avatar related styles to the components directory
* | | | | | | | | Merge branch ↵Filipa Lacerda2019-05-243-12/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '59987-move-sign-in-2fa-on-users-sign_in-above-intro-content-on-mobile' into 'master' Resolve "Move sign-in/2FA on users/sign_in above intro content on mobile" Closes #59987 See merge request gitlab-org/gitlab-ce!28360
| * | | | | | | | | Prioritize login form on mobile breakpoint59987-move-sign-in-2fa-on-users-sign_in-above-intro-content-on-mobileDennis Tang2019-05-163-12/+12
| | | | | | | | | |
* | | | | | | | | | Merge branch 'patch-64' into 'master'Kamil Trzciński2019-05-242-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update SAST.gitlab-ci.yml - Add SAST_GITLEAKS_ENTROPY_LEVEL Closes #62179 See merge request gitlab-org/gitlab-ce!28607
| * | | | | | | | | | Update SAST.gitlab-ci.yml - Add SAST_GITLEAKS_ENTROPY_LEVELLucas Charles2019-05-242-0/+6
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This env was missing, causing the variable to not be propagated to child containers and thus, be ineffective
* | | | | | | | | | Merge branch 'js-18n-batch-comments' into 'master'Kushal Pandya2019-05-242-2/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n of batch_comments directory See merge request gitlab-org/gitlab-ce!28178
| * | | | | | | | | | I18N of batch_comments directoryjs-18n-batch-commentsBrandon Labuschagne2019-05-212-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | | | | Merge branch '56959-remove-auto-devops-domain-ci-variable' into 'master'Stan Hu2019-05-2411-256/+20
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop support for AUTO_DEVOPS_DOMAIN See merge request gitlab-org/gitlab-ce!28460
| * | | | | | | | | | | Removes mention of $AUTO_DEVOPS_DOMAIN in doc56959-remove-auto-devops-domain-ci-variableThong Kuah2019-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though there's no relation to the feature (it's actually about overriding template values, best to replace this with $KUBE_INGRESS_BASE_DOMAIN to avoid any potential confusion
| * | | | | | | | | | | Remove un-used methodsThong Kuah2019-05-242-36/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These two methods were used in emitting AUTO_DEVOPS_DOMAIN which has now been dropped.
| * | | | | | | | | | | Stop emitting AUTO_DEVOPS_DOMAIN Ci variableThong Kuah2019-05-2410-219/+19
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation to reflect removal
* | | | | | | | | | | Merge branch '54528-add-rack-attack-to-structured-logs' into 'master'Stan Hu2019-05-246-2/+50
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes RackAttack logger to use structured logs Closes #54528 See merge request gitlab-org/gitlab-ce!28565
| * | | | | | | | | | | Changes RackAttack logger to use structured logsMayra Cabrera2019-05-246-2/+50
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a new filename to register auth logs. This change should allow SRE's queries to make better queries through logging infrastructure. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54528
* | | | | | | | | | | Merge branch '10795-add-epic-tree-BE-initial-support-docs' into 'master'Achilleas Pipinellis2019-05-231-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Epic Link documentation See merge request gitlab-org/gitlab-ce!28684
| * | | | | | | | | | | Update Epic Link documentationBrett Walker2019-05-231-1/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'docs/ssot_geo_nodes' into 'master'Achilleas Pipinellis2019-05-231-3/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit Geo nodes content to comply with SSOT guidelines See merge request gitlab-org/gitlab-ce!28519
| * | | | | | | | | | | Edit Geo nodes content to comply with SSOT guidelinesRussell Dickenson2019-05-231-3/+19
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/clarify-kubernetes-roles' into 'master'Achilleas Pipinellis2019-05-231-43/+44
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewording to clarify Access Control docs Closes #61204 See merge request gitlab-org/gitlab-ce!28452
| * | | | | | | | | | Rewording to clarify Access Control docsEvan Read2019-05-231-43/+44
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'sh-fix-omniauth-generic-strategy' into 'master'Douglas Barbosa Alexandre2019-05-233-1/+41
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix OmniAuth OAuth2Generic strategy not loading Closes #62216 See merge request gitlab-org/gitlab-ce!28680