summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'renovate/gitlab-ui-5.x' into 'master'Clement Ho2019-07-092-5/+5
|\ | | | | | | | | Update dependency @gitlab/ui to ^5.5.0 See merge request gitlab-org/gitlab-ce!30454
| * Update dependency @gitlab/ui to ^5.5.0Lukas Eipert2019-07-092-5/+5
| |
* | Merge branch '59965-remove-the-feature-flag-for-graphql' into 'master'Fatih Acet2019-07-0911-73/+8
|\ \ | | | | | | | | | | | | | | | | | | Remove the feature flag for GraphQL Closes #59965 See merge request gitlab-org/gitlab-ce!30444
| * | Remove `:graphql` feature flagcharlie ablett2019-07-0911-73/+8
|/ / | | | | | | | | | | | | | | - Remove `FeatureConstrainer` call wrapping api endpoint - Remove `Feature.enabled?(:graphql)` conditionals in back and frontend - Modify graphql test to be graphql flag agnostic - Remove api routing spec - Remove frontend feature flag via `gon`
* | Merge branch 'fix-median-counting-for-cycle-analytics' into 'master'Andreas Brandl2019-07-093-1/+40
|\ \ | | | | | | | | | | | | Add additional condition to count median properly See merge request gitlab-org/gitlab-ce!30229
| * | Modify specs according to reviewfix-median-counting-for-cycle-analyticsMałgorzata Ksionek2019-07-041-9/+8
| | |
| * | Rearrange spec for readabilityMałgorzata Ksionek2019-07-041-22/+23
| | |
| * | Fix rubocop offenceMałgorzata Ksionek2019-07-041-1/+1
| | |
| * | Add changelog entryMałgorzata Ksionek2019-07-041-0/+5
| | |
| * | Add where condition to count in median classMałgorzata Ksionek2019-07-042-1/+35
| | |
* | | Merge branch '7249-group-bulk-edit-issues-milestone-ce' into 'master'Sean McGivern2019-07-099-260/+315
|\ \ \ | | | | | | | | | | | | | | | | CE Port of Allow bulk update for group issues See merge request gitlab-org/gitlab-ce!30358
| * | | CE Port of Allow bulk update for group issuesFatih Acet2019-07-099-260/+315
|/ / / | | | | | | | | | | | | | | | | | | | | | This is a port MR for CE Original MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14141
* | | Merge branch 'patch-29' into 'master'Grzegorz Bizon2019-07-092-1/+6
|\ \ \ | | | | | | | | | | | | | | | | Updates to php:latest See merge request gitlab-org/gitlab-ce!30319
| * | | Updates to php:latestPaul Giberson2019-07-082-1/+6
| | | |
* | | | Merge branch 'remove-comment-from-auto-deploy-yml' into 'master'Sean McGivern2019-07-091-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove obsolete comment See merge request gitlab-org/gitlab-ce!30388
| * | | | Remove obsolete commentremove-comment-from-auto-deploy-ymlThong Kuah2019-07-051-1/+0
| | | | |
* | | | | Merge branch 'fj-fix-subgroup-search-url' into 'master'63603-update-project-import-export-docs-to-include-what-exactly-is-imported-exportedBob Van Landuyt2019-07-093-63/+68
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix subgroup url in search drop down Closes #52525 See merge request gitlab-org/gitlab-ce!30457
| * | | | | Fix subgroup url in search drop downFrancisco Javier López2019-07-093-63/+68
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inside a subgroup scope, when the user clicks on the search drop down in the header, some options are displayed. Some of this links direct the user to the issues and merge requests linked to the subgroup. Nevertheless, the url was broken because they doesn't include the complete group namespace
* | | | | Merge branch 'repo-list-root-caching' into 'master'Filipa Lacerda2019-07-091-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Fixed apollo caching of the root repository file listing See merge request gitlab-org/gitlab-ce!30409
| * | | | Fixed apollo caching of the root repository file listingPhil Hughes2019-07-051-1/+1
| | | | |
* | | | | Merge branch 'sl-raise-error-on-api-call-failure' into 'master'Sanad Liaquat2019-07-091-16/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Raise error if API returns a code other than what is expected See merge request gitlab-org/gitlab-ce!30301
| * | | | | Return created group idsl-raise-error-on-api-call-failureSanad Liaquat2019-07-031-1/+1
| | | | | |
| * | | | | Raise error on api call failureSanad Liaquat2019-07-031-15/+48
| | | | | |
* | | | | | Merge branch 'mf-modal-style-content-size' into 'master'Kushal Pandya2019-07-092-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust modal body styles to match design spec See merge request gitlab-org/gitlab-ce!30425
| * | | | | | Adjust modal body styles to match design specmf-modal-style-content-sizemfluharty2019-07-052-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set min-height to 80px via $modal-body-height Set padding to 16px overall and 48px on right via $grid-size
* | | | | | | Merge branch 'tz-update-mr-count-over-tabs' into 'master'Kushal Pandya2019-07-0915-2/+328
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates on success of an MR the count on top and in other tabs See merge request gitlab-org/gitlab-ce!29441
| * | | | | | | Updates on success of an MR the count on top and in other tabsTim Zallmann2019-07-0915-2/+328
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New API endpoint for merge request count Updates all open tabs at the same time with one call Restructured API response API response changed to 401 if no current_user Added API + JS specs Fix for Static Check Updated Count on Open/Close, Assign/Unassign of MR's Checking if MR Count is refreshed Added # frozen_string_literal: true to spec Added Changelog
* | | | | | | Merge branch 'docs/tidy-up-timezone-topic' into 'master'Achilleas Pipinellis2019-07-091-5/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tidy up timezone topic Closes #62058 See merge request gitlab-org/gitlab-ce!30495
| * | | | | | | Tidy up timezone topicEvan Read2019-07-091-5/+3
|/ / / / / / /
* | | | | | | Merge branch 'mf-modal-style-pin-position' into 'master'Phil Hughes2019-07-091-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pin modals at 64px from the top of the viewport See merge request gitlab-org/gitlab-ce!30412
| * | | | | | | Pin modals at 64px from the top of the viewportmf-modal-style-pin-positionmfluharty2019-07-051-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Was 30px
* | | | | | | Merge branch 'fe-fix-color-audit-on-wiki-pages-list-links' into 'master'Phil Hughes2019-07-091-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add font weight to links in wiki pages to be more distinguishable from static information Closes #61316 See merge request gitlab-org/gitlab-ce!29858
| * | | | | | | add font weight to links in wiki pages to be more distinguishable from ↵Eduardo Mejía2019-07-091-0/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | static information
* | | | | | | Merge branch 'pb-fix-confidential-mr-dropdown-typo' into 'master'Phil Hughes2019-07-093-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo on confidential MR dropdown See merge request gitlab-org/gitlab-ce!30499
| * | | | | | | Fix typo on confidential MR dropdownpb-fix-confidential-mr-dropdown-typoPatrick Bajao2019-07-093-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change issues to issue's
* | | | | | | | Merge branch 'docs-missing-backticks' into 'master'Achilleas Pipinellis2019-07-091-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add missing backtick fence to code block See merge request gitlab-org/gitlab-ce!30494
| * | | | | | | | Docs: Add missing backtick fence to code blockMarcel Amirault2019-07-091-0/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'docs-code-block-style' into 'master'Achilleas Pipinellis2019-07-0925-888/+909
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix spacing of code blocks See merge request gitlab-org/gitlab-ce!30453
| * | | | | | | | Fix spacing of code blocksMarcel Amirault2019-07-0925-888/+909
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code blocks should not be spaced 4 times, as this will prevent the code from being colored. They should also be spaced the same as the lists they are a part of, to make reading easier.
* | | | | | | | Merge branch 'docs-dangerfile-lint' into 'master'Achilleas Pipinellis2019-07-091-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Update danger to accept docs linting changes See merge request gitlab-org/gitlab-ce!30497
| * | | | | | | | Docs: Update danger to accept docs linting changesMarcel Amirault2019-07-091-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'trigger-build-docs-text' into 'master'Achilleas Pipinellis2019-07-091-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix docs URL in trigger-build-docs puts text See merge request gitlab-org/gitlab-ce!30473
| * | | | | | | | Fix docs URL in trigger-build-docs puts texttrigger-build-docs-textMike Lewis2019-07-081-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'lyle-master-patch-69439' into 'master'Evan Read2019-07-091-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes copying host keys a recommended step Closes #64211 See merge request gitlab-org/gitlab-ce!30487
| * | | | | | | | Makes copying host keys a recommended stepLyle Kozloff2019-07-091-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'qa-quarantine-push-limit-test' into 'master'Ramya Authappan2019-07-091-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quarantine failing push limit test See merge request gitlab-org/gitlab-ce!30496
| * | | | | | | | Quarantine failing testMark Lapierre2019-07-091-1/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-workhorse-helpers-module-missing' into 'master'Lin Jen-Shin2019-07-091-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix WorkhorseHelpers module is missing See merge request gitlab-org/gitlab-ce!30452
| * | | | | | | | Fix WorkhorseHelpers module is missingShinya Maeda2019-07-091-0/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This interferes spec execution on local environment.
* | | | | | | | Merge branch '64134-edit-comment' into 'master'Kushal Pandya2019-07-096-6/+88
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clicking edit button in a thread reply doesn’t work" Closes #64134 See merge request gitlab-org/gitlab-ce!30424