summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Passes file type down to ContentViewerDenys Mishunov2019-04-173-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of ContentViewer attempts to compute file type and render appropriate viewer type, compute it on the parent RepoEditor having all file-related information at its disposal and pass it down to ContentViewer as a prop
* | | | | | | | | Merge branch '58850-fix-misplaced-swipe-view' into 'master'Phil Hughes2019-04-234-30/+116
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make swipe view images line up Closes #58850 See merge request gitlab-org/gitlab-ce!26969
| * | | | | | | | Make swipe view images line upftab2019-04-234-30/+116
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If left without a width/height, swipeFrame goes off track when the image isn't wide enough to fill the available width. The spaceLeft prevented reaching the right edge of the image.
* | | | | | | | Merge branch 'sh-bump-nokogiri-1.10.3' into 'master'Lin Jen-Shin2019-04-234-6/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Nokogiri to 1.10.3 See merge request gitlab-org/gitlab-ce!27560
| * | | | | | | | Bump Nokogiri to 1.10.3sh-bump-nokogiri-1.10.3Stan Hu2019-04-224-6/+6
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pulls in a fix for libxslt that addresses CVE-2019-11068: https://github.com/sparklemotion/nokogiri/releases
* | | | | | | | Merge branch 'docs/add-cross-links' into 'master'Evan Read2019-04-231-18/+21
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Add doc cross links for large repositories See merge request gitlab-org/gitlab-ce!27303
| * | | | | | | Add doc cross links for large repositoriesSteve Azzopardi2019-04-231-18/+21
|/ / / / / / /
* | | | | | | Merge branch 'mk/remove-unused-code' into 'master'Stan Hu2019-04-221-6/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Remove unused code See merge request gitlab-org/gitlab-ce!27557
| * | | | | | Remove unused codeMichael Kozono2019-04-221-6/+0
|/ / / / / /
* | | | | | Merge branch '57293-fix-image-rename' into 'master'Clement Ho2019-04-223-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Renaming an image via Web IDE corrupts it" Closes #57293 See merge request gitlab-org/gitlab-ce!27486
| * | | | | | Revert "Created a hack to prevent setting content on image"Natalia Tepluhina2019-04-223-3/+8
|/ / / / / / | | | | | | | | | | | | | | | | | | This reverts commit e8c1c930c3bc7c159463ed3bed8765db01b40328.
* | | | | | Merge branch 'patch-52' into 'master'Stan Hu2019-04-221-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Victor Wu as proofreader See merge request gitlab-org/gitlab-ce!27527
| * | | | | | Add Victor Wu as proofreaderVictor Wu2019-04-221-3/+6
|/ / / / / /
* | | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-4-0' into 'master'James Lopez2019-04-223-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.4.0/11.10.0 See merge request gitlab-org/gitlab-ce!27508
| * | | | | | Update GitLab Runner Helm Chart to 0.4.0update-gitlab-runner-helm-chart-to-0-4-0Steve Azzopardi2019-04-193-3/+8
| | | | | | |
* | | | | | | Merge branch 'docs-fix-pipelines-merged-results' into 'master'Achilleas Pipinellis2019-04-221-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: update feature name "Pipelines for Merged Results" See merge request gitlab-org/gitlab-ce!27551
| * | | | | | | Docs: update feature name "Pipelines for Merged Results"Marcia Ramos2019-04-221-3/+3
|/ / / / / / /
* | | | | | | Merge branch 'docs/com-only-badges' into 'master'Marcia Ramos2019-04-221-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how to use GitLab.com only badges See merge request gitlab-org/gitlab-ce!27546
| * | | | | | | Document how to use GitLab.com only badgesAchilleas Pipinellis2019-04-221-0/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functionality added in https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/449
* | | | | | | Merge branch 'docs-fix-typo' into 'master'Achilleas Pipinellis2019-04-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: fixes grammar/typo See merge request gitlab-org/gitlab-ce!27547
| * | | | | | | Docs: fixes grammar/typoMarcia Ramos2019-04-221-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'qa/improve-performance-of-login-test-and-remove-comments' into ↵Ramya Authappan2019-04-223-10/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Improve performance of login test and remove comments See merge request gitlab-org/gitlab-ce!27515
| * | | | | | Remove unnecessary comments from login testsWalmyr2019-04-223-10/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comments were TODOs but there were no explanation of what needed to be done. Also, I think the expectation describes very well how it checks that the user is logged in. Finally, as Robert C. Martin said once: "After you check in a TODO comment it turns into a DON'T DO"
* | | | | | Merge branch 'jv-dedup-activerecord' into 'master'Stan Hu2019-04-206-8/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong use of ActiveRecord in PoolRepository See merge request gitlab-org/gitlab-ce!27464
| * | | | | | Fix wrong use of ActiveRecord in PoolRepositoryJacob Vosmaer2019-04-206-8/+16
|/ / / / / /
* | | | | | Merge branch '57247-show-prioritized-labels-to-guests' into 'master'Clement Ho2019-04-197-35/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show prioritized labels to guests Closes #57247 See merge request gitlab-org/gitlab-ce!27307
| * | | | | | Show prioritized labels to guests57247-show-prioritized-labels-to-guestsHeinrich Lee Yu2019-04-197-35/+59
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Disables sorting when guests are viewing
* | | | | | Merge branch 'retry-review-deploy-twice' into 'master'Lin Jen-Shin2019-04-194-6/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retry the review-deploy job twice and make the Review App cleanup more efficient See merge request gitlab-org/gitlab-ce!27489
| * | | | | | Make the Review App cleanup more efficientretry-review-deploy-twiceRémy Coutable2019-04-194-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that the cleanup starts right away. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Retry the review-deploy job twiceRémy Coutable2019-04-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'xanf/gitlab-ce-improve-project-overview' into 'master'Stan Hu2019-04-196-4/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements to Project overview UI Closes #55025 See merge request gitlab-org/gitlab-ce!26796
| * | | | | | | Improvements to Project overview UIIllya Klymov2019-04-196-4/+45
|/ / / / / / /
* | | | | | | Merge branch 'quarantine-flaky-tests' into 'master'Lin Jen-Shin2019-04-191-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Flaky tests: spec/requests/api/badges_spec.rb" Closes #60397 See merge request gitlab-org/gitlab-ce!27484
| * | | | | | | Put three flaky tests in quarantinequarantine-flaky-testsRémy Coutable2019-04-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'fixed-diff-border' into 'master'Annabel Dunstone Gray2019-04-191-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the border color on diffs See merge request gitlab-org/gitlab-ce!27479
| * | | | | | | | Fixes the border color on diffsPhil Hughes2019-04-181-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'tpresa-fix-whitespace-in-cluster-docs' into 'master'Achilleas Pipinellis2019-04-191-20/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove leading whitespaces from serviceaccount/clusterrolebinding multi-resource YAML See merge request gitlab-org/gitlab-ce!27501
| * | | | | | | | | Remove leading whitespaces from serviceaccount/clusterrolebinding ↵Thiago Presa2019-04-191-20/+20
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | multi-resource YAML
* | | | | | | | | Merge branch 'small-improvement-in-docs' into 'master'Achilleas Pipinellis2019-04-191-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Highlighted 'not' in the docs See merge request gitlab-org/gitlab-ce!27506
| * | | | | | | | | Highlighted 'not' in the docsKartikey Tanna2019-04-191-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ce-issue-10671' into 'master'Grzegorz Bizon2019-04-192-8/+8
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | CE part for extract EE specific lines from issue.rb See merge request gitlab-org/gitlab-ce!27481
| * | | | | | | | Aligned changes to Issuable with EEce-issue-10671Patrick Derichs2019-04-181-4/+4
| | | | | | | | |
| * | | | | | | | Aligned IssuesController implementation with EEPatrick Derichs2019-04-181-4/+4
| | | | | | | | |
* | | | | | | | | Merge branch ↵Grzegorz Bizon2019-04-192-21/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58663-use-include-template-syntax-for-including-the-code-quality-job' into 'master' Resolve "Use include template syntax for including the Code Quality job" Closes #58663 See merge request gitlab-org/gitlab-ce!27448
| * | | | | | | | | Update CodeQuality example docs58663-use-include-template-syntax-for-including-the-code-quality-jobMatija Čupić2019-04-171-20/+26
| | | | | | | | | |
| * | | | | | | | | Include CodeQuality with template syntaxMatija Čupić2019-04-171-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'bvl-graphql-only-authorize-rendered-fields' into 'master'Lin Jen-Shin2019-04-199-121/+226
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only check abilities on rendered GraphQL nodes Closes #58647 and #60355 See merge request gitlab-org/gitlab-ce!27273
| * | | | | | | | | | Only check abilities on rendered GraphQL nodesBob Van Landuyt2019-04-189-121/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this we only check abilities on the rendered edges of a GraphQL connection instead of all the nodes in it.
* | | | | | | | | | | Update VERSION to 11.11.0-prev11.11.0.preGitLab Release Tools Bot2019-04-191-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Update CHANGELOG.md for 11.10.0GitLab Release Tools Bot2019-04-19204-1021/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]