summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use transactions in JS feature specsjs-specs-transactionsHeinrich Lee Yu2019-07-128-29/+85
| | | | | Uses Rails transactional tests instead of DatabaseCleaner transaction strategy because that doesn't work with JS tests
* Merge branch 'docs-code-block-style-2' into 'master'Evan Read2019-07-1217-1232/+1247
|\ | | | | | | | | Docs: Fix whitespace in administration docs See merge request gitlab-org/gitlab-ce!30554
| * Fix whitespace in many administration docsMarcel Amirault2019-07-1217-1232/+1247
|/ | | | | | | | | Many code blocks are 4spaced, and they render in GitLab without coloring as a result, even though they are fenced with a language label. If in a list, other items will render as being in a code block too, even if not meant to. This fixes all these issues for many admin docs in /high_availability and /auth (part 1)
* Merge branch 'mf-modal-style-close-button' into 'master'Annabel Dunstone Gray2019-07-121-0/+7
|\ | | | | | | | | Add modal close button styles to match design spec See merge request gitlab-org/gitlab-ce!30423
| * Add modal close button styles to match design specMiranda Fluharty2019-07-121-0/+7
|/ | | | | | Standard font weight and line height, darker color, full opacity Change `button.close` to `.close` Some existing modal buttons are links rather than buttons
* Merge branch 'da-update-note-about-internal-url-docs' into 'master'Evan Read2019-07-111-2/+2
|\ | | | | | | | | Geo Update note about internal_url See merge request gitlab-org/gitlab-ce!30573
| * Geo Update note about internal_urlDouglas Barbosa Alexandre2019-07-111-2/+2
|/
* Merge branch 'docs-hard-tabs' into 'master'Evan Read2019-07-119-70/+68
|\ | | | | | | | | Remove hard tabs from docs See merge request gitlab-org/gitlab-ce!30445
| * Remove hard tabs from docsMarcel Amirault2019-07-119-70/+68
|/ | | | | Hard tabs do not follow general markdown guidelines are were removed from the few docs that used them
* Merge branch '64403-remove-setimmediate-polyfill' into 'master'Clement Ho2019-07-113-5/+6
|\ | | | | | | | | Remove setImmediate polyfill from production assets See merge request gitlab-org/gitlab-ce!30591
| * Update setImmediate use in karma specs64403-remove-setimmediate-polyfillMike Greiling2019-07-112-1/+3
| |
| * Remove use of setTimeout in karma specsMike Greiling2019-07-111-4/+1
| |
| * Remove setImmediate polyfill from production assetsMike Greiling2019-07-101-2/+4
| |
* | Merge branch 'patch-71' into 'master'Ray Paik2019-07-111-1/+1
|\ \ | | | | | | | | | | | | Update index.md - Fixing a minor typo on the postgreSQL setup instructions See merge request gitlab-org/gitlab-ce!30437
| * | Update index.md - Fixing a minor typo on the postgreSQL setup instructionsOve Heigre2019-07-071-1/+1
| | |
* | | Merge branch 'renovate/gitlab-ui-5.x' into 'master'Mike Greiling2019-07-112-5/+5
|\ \ \ | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^5.6.0 See merge request gitlab-org/gitlab-ce!30544
| * | | Update dependency @gitlab/ui to ^5.6.0Lukas Eipert2019-07-112-5/+5
| | | |
* | | | Merge branch 'qa/shorten-test-description' into 'master'Dan Davison2019-07-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Shorten test description See merge request gitlab-org/gitlab-ce!30638
| * | | | Shorten test descriptionqa/shorten-test-descriptionWalmyr Lima2019-07-111-1/+1
| | | | |
* | | | | Merge branch 'qa/explicitly-create-resources-via-api' into 'master'Dan Davison2019-07-111-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Explicitly create resources via the API See merge request gitlab-org/gitlab-ce!30639
| * | | | | Explicitly create resources via the APIqa/explicitly-create-resources-via-apiWalmyr Lima2019-07-111-2/+2
| |/ / / /
* | | | | Merge branch 'qa/explicitly-create-resources-via-browser-ui' into 'master'Dan Davison2019-07-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Explicitly create resource via browser ui See merge request gitlab-org/gitlab-ce!30640
| * | | | | Explicitly create resource via browser uiqa/explicitly-create-resources-via-browser-uiWalmyr Lima2019-07-111-1/+1
| |/ / / /
* | | | | Merge branch '10364-dismissal-reason-any-comment-CE' into 'master'Fatih Acet2019-07-111-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE backport for Dismissal Reasons See merge request gitlab-org/gitlab-ce!29422
| * | | | | CE backport for Dismissal Reasons10364-dismissal-reason-any-comment-CEsamdbeckham2019-07-111-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12067
* | | | | | Merge branch 'mf-modal-style-header-size' into 'master'Annabel Dunstone Gray2019-07-111-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set modal header/title size to match design spec See merge request gitlab-org/gitlab-ce!30420
| * | | | | | Set modal header/title size to match design specmf-modal-style-header-sizemfluharty2019-07-051-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set line height of title to 24px as given in spec Given 16px padding, total header height is now 56px as given in spec Use variables for padding/margin for close button (bootstrap now >4.2)
* | | | | | | Merge branch 'mfluharty-modal-style-border-radius-correction' into 'master'Annabel Dunstone Gray2019-07-111-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply modal border-radius only to direct children See merge request gitlab-org/gitlab-ce!30645
| * | | | | | | Apply modal border-radius only to direct childrenmfluharty-modal-style-border-radius-correctionmfluharty2019-07-111-2/+2
| | | | | | | |
* | | | | | | | Merge branch '12557-tree-content' into 'master'Douglas Barbosa Alexandre2019-07-112-1/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move EE differences for `app/views/projects/tree/_tree_content.html.haml` Closes gitlab-ee#12557 See merge request gitlab-org/gitlab-ce!30455
| * | | | | | | | Moves method to TreeHelperFilipa Lacerda2019-07-112-1/+8
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuses existing TreeHelper instead of creating a new one just for one method.
* | | | | | | | Merge branch 'ci-clean-up-reports-jobs' into 'master'Mayra Cabrera2019-07-112-6/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up CI reports See merge request gitlab-org/gitlab-ce!30272
| * | | | | | | | Clean up CI reportsPhilippe Lafoucrière2019-07-112-6/+7
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, `SAST_CONFIDENCE_LEVEL` has been renamed in https://gitlab.com/gitlab-org/security-products/sast/merge_requests/72
* | | | | | | | Merge branch 'improve-chaos-controller' into 'master'Stan Hu2019-07-113-46/+113
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `db_spin` and refactor ChaosController Closes #64425 See merge request gitlab-org/gitlab-ce!30559
| * | | | | | | Add `db_spin` and refactor ChaosControllerimprove-chaos-controllerKamil Trzciński2019-07-113-46/+113
| | | | | | | |
* | | | | | | | Merge branch '64388-remove-unused-code' into 'master'Mayra Cabrera2019-07-111-4/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused method Closes #64388 See merge request gitlab-org/gitlab-ce!30576
| * | | | | | | | Remove unused methodRyan Cobb2019-07-111-4/+0
|/ / / / / / / /
* | | | | | | | Merge branch 'qa/e2e-test-issue-comment' into 'master'63572-saml-authorize-screen-does-not-show-user-accountWalmyr2019-07-113-1/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add end-to-end test for creating and editing issue comments See merge request gitlab-org/gitlab-ce!30571
| * | | | | | | | Add new e2e test for adding and editing commentsqa/e2e-test-issue-commentWalmyr Lima2019-07-111-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...on issues.
| * | | | | | | | Update page object with new element and methodWalmyr Lima2019-07-111-0/+10
| | | | | | | | |
| * | | | | | | | Update vue component with class for testabilityWalmyr Lima2019-07-111-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '35757-move-issues-in-boards-pderichs' into 'master'Jan Provaznik2019-07-116-11/+354
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add endpoint to move issues in boards See merge request gitlab-org/gitlab-ce!30216
| * | | | | | | | | Add endpoint to move multiple issues35757-move-issues-in-boards-pderichsPatrick Derichs2019-07-116-11/+354
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs for new endpoint to move multiple issues. Add changelog entry Just check the first issue for the ability to move / update Add specs for exceeding limits and malformed requests Changed name of shared examples Change title of changelog entry Use %i instead of %w Check permission to update issue on project instead of board Use admin_issue permission to check for issue move ability Changed variable name to avoid shadow issue_params method Rename route to bulk_move Change route definition Check permissions for each issue Combine methods for parameters permit check Remove extra context Change description of context Check param for type Array Add unit tests to MoveService Use before_action for permission check Use set instead of let! Use let's instead of set
* | | | | | | | | | Merge branch '63667-hashed-storage-migration-count-correctly' into 'master'Douglas Barbosa Alexandre2019-07-115-57/+118
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display the amount for Hashed Storage migration/rollback correctly Closes #63667 See merge request gitlab-org/gitlab-ce!29996
| * | | | | | | | | Display the amount for Hashed Storage migration/rollback correctly63667-hashed-storage-migration-count-correctlyGabriel Mazetto2019-07-104-57/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rake script considers the specified range, if present, to calculate the affected amount of projects correctly.
| * | | | | | | | | Added the `abort_execution` matcherGabriel Mazetto2019-07-101-0/+46
| | | | | | | | | |
* | | | | | | | | | Merge branch '51575-remove-rails-4-specific-code-from-fromunion-from_union' ↵Robert Speicher2019-07-111-5/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove Rails 4-specific code from `FromUnion.from_union` Closes #51575 See merge request gitlab-org/gitlab-ce!30587
| * | | | | | | | | | Pass string directly to #from51575-remove-rails-4-specific-code-from-fromunion-from_unionHeinrich Lee Yu2019-07-111-5/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'gitaly-version-v1.53.0' into 'master'64440-limit-creation-of-the-alert-bot-in-usage-pingJan Provaznik2019-07-112-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.53.0 See merge request gitlab-org/gitlab-ce!30614
| * | | | | | | | | | | Upgrade Gitaly to v1.53.0GitalyBot2019-07-112-1/+6
|/ / / / / / / / / / /
View Lorry Controller Status