summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update e2e test with more explicit methodsqa-de-quarantine-e2e-testWalmyr Lima2019-06-031-2/+2
| | | | This goes in accordance with https://bit.ly/2Z1RdjZ
* De-quarantine e2e test for issue suggestionsWalmyr Lima2019-06-031-2/+1
| | | | | | | According to https://bit.ly/2JTPCcF Now that https://gitlab.com/gitlab-org/gitlab-ce/issues/60355 is closed we can de-quarantine this test.
* Merge branch 'fix-search-dropdown-blur-close' into 'master'Filipa Lacerda2019-06-034-2/+21
|\ | | | | | | | | | | | | Fix search dropdown not closing on blur if empty Closes #53741 See merge request gitlab-org/gitlab-ce!28730
| * Fix search dropdown not closing on blur if emptyfix-search-dropdown-blur-closeLuke Bennett2019-05-314-2/+21
| |
* | Merge branch '59854-fix-forms-stylint-issues' into 'master'Filipa Lacerda2019-06-033-106/+61
|\ \ | | | | | | | | | | | | | | | | | | Fix style-lint errors and warnings for `app/assets/stylesheets/framework/forms.scss` Closes #59854 See merge request gitlab-org/gitlab-ce!28129
| * | Remove responsive column classes for sm screens59854-fix-forms-stylint-issuesEnrique Alcantara2019-05-302-38/+38
| | |
| * | Remove unnecessary btn stylingEnrique Alcantara2019-05-301-7/+0
| | |
| * | Remove unnecessary text-block stylingEnrique Alcantara2019-05-303-44/+27
| | |
| * | Use single position: relative declarationEnrique Alcantara2019-05-301-21/+18
| | |
| * | Remove unused form-control-label selectorEnrique Alcantara2019-05-301-22/+4
| | |
* | | Merge branch '10795-add-epic-tree-BE-epic-graphql-support' into 'master'Nick Thomas2019-06-0310-6/+62
|\ \ \ | | | | | | | | | | | | | | | | Backport to add fields to IssueType See merge request gitlab-org/gitlab-ce!28998
| * | | Added common fields to the IssueType10795-add-epic-tree-BE-epic-graphql-supportBrett Walker2019-05-3110-6/+62
| | | | | | | | | | | | | | | | | | | | and allow passing of child_complexity to the 'resolver_complexity' metho
* | | | Merge branch 'zj-remove-delta-island-feature-flag' into 'master'Bob Van Landuyt2019-06-032-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove delta island feature flag Closes gitaly#1575 See merge request gitlab-org/gitlab-ce!28871
| * | | | Remove delta island feature flagZeger-Jan van de Weg2019-06-032-1/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | Delta islands were implemented last released in: https://gitlab.com/gitlab-org/gitaly/merge_requests/1110. It's been enabled on production and works as expected.
* | | | Merge branch ↵Phil Hughes2019-06-031-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '11041-move-ee-differences-for-app-views-search-_results-html-haml' into 'master' CE: Resolve EE differences in search/_results.html.haml See merge request gitlab-org/gitlab-ce!28952
| * | | | CE: Resolve EE differences in search/_results.html.haml11041-move-ee-differences-for-app-views-search-_results-html-hamlDonald Cook2019-05-311-1/+2
| | | | |
* | | | | Merge branch '62429-remove-unused-avatar-sizes' into 'master'Phil Hughes2019-06-035-38/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused avatar sizes Closes #62429 See merge request gitlab-org/gitlab-ce!28947
| * | | | | Remove unused avatar sizes62429-remove-unused-avatar-sizesAnnabel Dunstone Gray2019-05-315-38/+6
| | |/ / / | |/| | | | | | | | | | | | | - Update avatars to use only sizes from the 8px grid
* | | | | Merge branch 'remove-mr-diff-header-height' into 'master'Phil Hughes2019-06-033-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove fixed height from MR diff headers Closes #62596 See merge request gitlab-org/gitlab-ce!28946
| * | | | | Remove fixed height from MR diff headersremove-mr-diff-header-heightAnnabel Dunstone Gray2019-05-313-2/+6
| | | | | |
* | | | | | Merge branch 'gitlab-ui-259-style-checkboxes' into 'master'Kushal Pandya2019-06-031-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style gitlab-ui checkboxes See merge request gitlab-org/gitlab-ce!28622
| * | | | | | Style gitlab-ui checkboxesSam Bigelow2019-05-301-0/+14
| | | | | | |
* | | | | | | Merge branch 'patch-48' into 'master'Ray Paik2019-06-031-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix typos See merge request gitlab-org/gitlab-ce!29020
| * | | | | | | Fix typoPhilipp C. H2019-06-011-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'patch-65' into 'master'Ray Paik2019-06-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in multiple_assignees_for_issues.md See merge request gitlab-org/gitlab-ce!29002
| * | | | | | | | Update multiple_assignees_for_issues.mdIlya Peterov2019-05-311-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'sh-bump-ruby-concurrency-gem' into 'master'Ash McKenzie2019-06-031-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump concurrent-ruby and concurrent-ruby-ext to 1.1.5 See merge request gitlab-org/gitlab-ce!29015
| * | | | | | | | Bump concurrent-ruby and concurrent-ruby-ext to 1.1.5sh-bump-ruby-concurrency-gemStan Hu2019-06-011-3/+3
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches the version used in Gitaly and avoids potential version conflicts when multiple versions are installed.
* | | | | | | | Merge branch 'docs/admin_area_runners' into 'master'Evan Read2019-06-032-2/+53
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the Admin Area's *Runners* page See merge request gitlab-org/gitlab-ce!28852
| * | | | | | | | Document the Admin Area's *Runners* pageRussell Dickenson2019-06-032-2/+53
|/ / / / / / / /
* | | | | | | | Merge branch '60782-docs-redis-troubleshooting-replication' into 'master'Evan Read2019-06-031-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs feedback: Redis Troubleshooting Replication Closes #60782 See merge request gitlab-org/gitlab-ce!28936
| * | | | | | | Fix troubleshooting command to include host and quote password60782-docs-redis-troubleshooting-replicationGabriel Mazetto2019-05-301-1/+1
| | | | | | | |
* | | | | | | | Merge branch '61821-tooltip-consistency' into 'master'Mike Greiling2019-06-013-11/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Tooltip Consistency" Closes #61821 See merge request gitlab-org/gitlab-ce!28839
| * | | | | | | | Make tooltips consistently render on topJustin Boyson2019-06-013-11/+17
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On edit-button simply set position to top. Made this change directly in template since edit-button is only used in one place. Had to wrap the comments toggle button in span tag to make tooltip show even when disabled as per bootstrap-vue docs. https://bootstrap-vue.js.org/docs/components/tooltip#overview Note: Also changexc button to gl-buttonto be consistent with rest of file.
* | | | | | | | Merge branch 'revert-2d980fad' into 'master'Mike Greiling2019-05-313-8/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'js-i18n-board-store' into 'master'" See merge request gitlab-org/gitlab-ce!28977
| * | | | | | | | Revert "Merge branch 'js-i18n-board-store' into 'master'"revert-2d980fadBrandon Labuschagne2019-05-313-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !28712
* | | | | | | | | Merge branch 'osw-reset-merge-status-from-mergeable-mrs' into 'master'Douglas Barbosa Alexandre2019-05-317-1/+172
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset merge status from mergeable MRs See merge request gitlab-org/gitlab-ce!28843
| * | | | | | | | | Reset merge status from mergeable MRsOswaldo Ferreira2019-05-317-1/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds migrations to reset the merge_status of opened, mergeable MRs. That's required by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28513 so we're able to sync the status update along merge-ref, without leaving MRs with a stale merge-ref.
* | | | | | | | | | Merge branch '61339-Add-underline-to-attach-a-file' into 'master'Annabel Dunstone Gray2019-05-314-17/+31
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hover and focus to "Attach a file" Closes #61339 See merge request gitlab-org/gitlab-ce!28682
| * | | | | | | | | Add hover and focus to "Attach a file"Marcel van Remmerden2019-05-314-17/+31
|/ / / / / / / / /
* | | | | | | | | Merge branch '56959-drop-project_auto_devops_domain' into 'master'Robert Speicher2019-05-316-5/+21
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes project_auto_devops#domain column Closes #56959 See merge request gitlab-org/gitlab-ce!28574
| * | | | | | | | Postmigrate to drop domain column56959-drop-project_auto_devops_domainThong Kuah2019-05-313-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the column is ignored, we can safely drop the column
| * | | | | | | | Ignore ProjectAutoDevops domain columnThong Kuah2019-05-313-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This column is no longer used. The form was removed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24580 and other usages removed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28460. Remove final usages of :domain
* | | | | | | | | Merge branch 'docs-push-rule-committer-restriction' into 'master'Drew Blessing2019-05-311-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 'committer restriction' push rule name See merge request gitlab-org/gitlab-ce!28994
| * | | | | | | | | Update 'committer restriction' push rule nameDrew Blessing2019-05-311-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'dz-scope-project-routes-3' into 'master'Lin Jen-Shin2019-05-3110-54/+83
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Move some project routes under - scope See merge request gitlab-org/gitlab-ce!28830
| * | | | | | | | Fix js api spec for new labels featuredz-scope-project-routes-3Dmitriy Zaporozhets2019-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Fix labels creating with new routeDmitriy Zaporozhets2019-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Add specs for Milestone reference methodsDmitriy Zaporozhets2019-05-291-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Add /-/ scope to link_reference_patternDmitriy Zaporozhets2019-05-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>