summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'if-10137-ee_specific_lines_issues_api' into 'master'Yorick Peterse2019-05-292-12/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of Move EE specific lines in API::Issues See merge request gitlab-org/gitlab-ce!28725
| * | | | | | | CE port of Move EE specific lines in API::IssuesImre Farkas2019-05-292-12/+10
|/ / / / / / /
* | | | | | | Merge branch 'mc/feature/reports-download' into 'master'Grzegorz Bizon2019-05-298-2/+97
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow downloading report artifacts Closes #49265 See merge request gitlab-org/gitlab-ce!27974
| * | | | | | Extract Ci::Build#report_artifacts into methodmc/feature/reports-downloadMatija Čupić2019-05-284-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extracts combining the job_artifacts relation with the with_reports scope for getting report artifacts into a method.
| * | | | | | Rename with_all_reports to with_reportsMatija Čupić2019-05-284-10/+13
| | | | | | |
| * | | | | | Move JobArtifactEntity to JobArtifactReportEntityMatija Čupić2019-05-283-3/+3
| | | | | | |
| * | | | | | Expose report download path in build detailsMatija Čupić2019-05-284-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Exposes report download paths in build details.
| * | | | | | Add all reports scope to Ci::JobArtifactMatija Čupić2019-05-282-0/+19
| | | | | | |
* | | | | | | Merge branch 'tpresa-using-license-seat' into 'master'Sean McGivern2019-05-291-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show if a user is using a license seat See merge request gitlab-org/gitlab-ce!28790
| * | | | | | | Show if a user is using a license seattpresa-using-license-seatThiago Presa2019-05-281-0/+2
| | | | | | | |
* | | | | | | | Merge branch 'i18n-status-fix' into 'master'Bob Van Landuyt2019-05-292-4/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Remove leading whitespace on translatable string: "Status" See merge request gitlab-org/gitlab-ce!23856
| * | | | | | | Merged changes from masterDavid Planella2019-05-288245-169066/+510137
| |\ \ \ \ \ \ \
| * | | | | | | | Update .pot file with changed stringsDavid Planella2018-12-161-3/+0
| | | | | | | | |
| * | | | | | | | Fix leading whitespace in translatable stringDavid Planella2018-12-161-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'revert-karma-timeout' into 'master'Grzegorz Bizon2019-05-292-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase karma global timeout See merge request gitlab-org/gitlab-ce!28850
| * | | | | | | | | Increase global karma timeoutrevert-karma-timeoutHeinrich Lee Yu2019-05-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert useless timeout added in karma spec
* | | | | | | | | | Merge branch 'repo-router-fixes' into 'master'Filipa Lacerda2019-05-295-11/+17
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes repository Vue router hiding elements on root URL See merge request gitlab-org/gitlab-ce!28821
| * | | | | | | | | | Fixes repository Vue router hiding elements on root URLPhil Hughes2019-05-285-11/+17
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'patch-31' into 'master'Evan Read2019-05-291-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct CI_API_V4_URL CI variable name See merge request gitlab-org/gitlab-ce!28849
| * | | | | | | | | Correct CI_API_V4_URL CI variable namePhy2019-05-281-4/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch '11105-fix-cs-with-proxy' into 'master'Achilleas Pipinellis2019-05-292-0/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable proxy in container scanning template Closes gitlab-ee#11105 See merge request gitlab-org/gitlab-ce!27246
| * | | | | | | | | Disable proxy in container scanning templatePhilippe Lafoucrière2019-05-292-0/+8
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11105
* | | | | | | | | Merge branch 'patch-49' into 'master'Evan Read2019-05-281-6/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve documentation of RegExp in CI/CD job ref patterns See merge request gitlab-org/gitlab-ce!28139
| * | | | | | | | | Improve documentation of RegExp in CI/CD job ref patternsRaphael Das Gupta2019-05-281-6/+23
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | as requested by https://gitlab.com/gitlab-org/gitlab-ce/issues/30477#note_29060568 in #30477
* | | | | | | | | Merge branch 'auto-devops-kubernestes-bump1-11-10' into 'master'61146-style-tertiary-button-type-to-be-aligned-with-pattern-libraryRobert Speicher2019-05-282-1/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bumps Kubernetes in Auto DevOps to 1.11.10 See merge request gitlab-org/gitlab-ce!28525
| * | | | | | | | Bumps Kubernetes version to 1.11.10auto-devops-kubernestes-bump1-11-10Thong Kuah2019-05-212-1/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'qa-unquarantine-auto-devops' into 'master'Dan Davison2019-05-281-2/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Un-quarantine Auto DevOps QA test Closes gitlab-org/quality/nightly#81 See merge request gitlab-org/gitlab-ce!28765
| * | | | | | | | | Un-quarantine Auto DevOps QA testun-quarantine-qa-auto-devopsqa-unquarantine-auto-devopsThong Kuah2019-05-271-2/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'pipelines-email-default-branch-filter' into 'master'Mayra Cabrera2019-05-285-20/+86
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notify_only_default_branch option to PipelinesEmailService Closes #61721 See merge request gitlab-org/gitlab-ce!28271
| * | | | | | | | | | Add notify_only_default_branch option to PipelinesEmailServicePeter Marko2019-05-285-20/+86
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sh-add-header-to-jobs-admin-page' into 'master'Clement Ho2019-05-282-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a column header to admin/jobs page Closes #62347 See merge request gitlab-org/gitlab-ce!28837
| * | | | | | | | | | Add a column header to admin/jobs pagesh-add-header-to-jobs-admin-pageStan Hu2019-05-282-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This column was blank before. It contain one or two pieces of information: * Job duration * Job completion timestamp For brevity, use `Timing` as the header. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62347
* | | | | | | | | | | Merge branch 'glossary-merge-request-mr' into 'master'Tom Atkins2019-05-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add MR as common abbreviation for 'Merge Request' See merge request gitlab-org/gitlab-ce!28793
| * | | | | | | | | | Add MR as common abbreviation for 'Merge Request'glossary-merge-request-mrRene Verschoor2019-05-271-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch '62227-webkit-icon-overlap' into 'master'Annabel Dunstone Gray2019-05-282-0/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable webkit icons Closes #62227 See merge request gitlab-org/gitlab-ce!28833
| * | | | | | | | | | Disable webkit icons62227-webkit-icon-overlapJarek Ostrowski2019-05-282-0/+15
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable webkit icons to make room for our icons. Add changelog Fix lint, add ignore to stylelint Add enable to start lint again
* | | | | | | | | | Merge branch 'kp-clean-up-avatars-stylesheet' into 'master'Annabel Dunstone Gray2019-05-281-98/+142
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use SCSS maps and lists to keep code DRY See merge request gitlab-org/gitlab-ce!28702
| * | | | | | | | | | Use SCSS maps and lists to keep code DRYkp-clean-up-avatars-stylesheetKushal Pandya2019-05-271-98/+142
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'doc-qa-doc-element-guidelines' into 'master'Lin Jen-Shin2019-05-285-52/+103
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for element naming conventions See merge request gitlab-org/gitlab-ce!28563
| * | | | | | | | | | | Iteration for _field being the well-formed elementddavison2019-05-281-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since number fields, text boxes, text areas are editable lets use _field as the vague descriptor
| * | | | | | | | | | | Add documentation for element naming conventionsddavison2019-05-285-52/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor all capital files to lowercase Signed-off-by: ddavison <ddavison@gitlab.com>
* | | | | | | | | | | | Merge branch 'i18n-chat-of-user-profile' into 'master'Clement Ho2019-05-284-10/+36
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings of chat page in user profile See merge request gitlab-org/gitlab-ce!28632
| * | | | | | | | | | | Externalize strings of chat page in user profileantony liu2019-05-284-10/+36
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'docs/gb/expand-downstream-pipeline-variables' into 'master'Douglas Barbosa Alexandre2019-05-281-0/+28
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs for a downstream pipeline variables expansion See merge request gitlab-org/gitlab-ce!28828
| * | | | | | | | | | | Docs for a downstream pipeline variables expansionGrzegorz Bizon2019-05-281-0/+28
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'i18n-notifications-of-user-profile' into 'master'Bob Van Landuyt2019-05-286-13/+40
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings of notifications page in user profile See merge request gitlab-org/gitlab-ce!28745
| * | | | | | | | | | | Externalize strings of notifications page in user profileantony liu2019-05-286-13/+40
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'qa-extend-click-visit-actions' into 'master'Dan Davison2019-05-2814-46/+145
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement dynamic validation on QA Pages Closes gitlab-qa#280 See merge request gitlab-org/gitlab-ce!25704
| * | | | | | | | | | Remove blocks from Runtime::Browser.visit calls within Mattermost testsqa-extend-click-visit-actionsddavison2019-05-201-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use .perform instead of .act in Mattermost test Signed-off-by: ddavison <ddavison@gitlab.com>
| * | | | | | | | | | Up wait time to 60 seconds as before for LoginPageddavison2019-05-201-1/+1
| | | | | | | | | | |
View Lorry Controller Status