summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | 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
| | | | | | | | | |
* | | | | | | | | | Moves method to TreeHelperFilipa Lacerda2019-07-112-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuses existing TreeHelper instead of creating a new one just for one method.
* | | | | | | | | | Merge branch 'improve-chaos-controller' into 'master'Stan Hu2019-07-111-23/+64
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-111-23/+64
| | | | | | | | | |
* | | | | | | | | | Merge branch 'qa/e2e-test-issue-comment' into 'master'63572-saml-authorize-screen-does-not-show-user-accountWalmyr2019-07-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add end-to-end test for creating and editing issue comments See merge request gitlab-org/gitlab-ce!30571
| * | | | | | | | | | 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-112-10/+63
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-112-10/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Load terminal css file in environments pageJacques Erasmus2019-07-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loaded the xterm css file in order to fix the styling issues
* | | | | | | | | | | Correct link to external_dashboard docReuben Pereira2019-07-111-1/+1
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch '64161-gitlab-fqdn' into 'master'Grzegorz Bizon2019-07-111-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI variable to provide GitLab FQDN Closes #64161 See merge request gitlab-org/gitlab-ce!30417
| * | | | | | | | | Add CI variable to provide GitLab FQDNBalasankar "Balu" C2019-07-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | | | | | | | | | Merge branch 'registry-fix-multi-delete-modal' into 'master'Kushal Pandya2019-07-112-13/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set unique modal IDs See merge request gitlab-org/gitlab-ce!30532
| * | | | | | | | | | Set unique modal IDsregistry-fix-multi-delete-modalPaul Gascou-Vaillancourt2019-07-092-13/+6
| | | | | | | | | | |
* | | | | | | | | | | Give Knative serving permissions to service accountHordur Freyr Yngvason2019-07-112-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab uses a kubernetes service account to perform deployments. For serverless deployments to work as expected with externally created clusters with their own knative installations (e.g. via Cloud Run), this account requires additional permissions in the serving.knative.dev API group.
* | | | | | | | | | | Bring buttons style up to design specScott Hampton2019-07-1113-87/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a CSS effort only. Fixes the padding of the buttons to be `8px 12px` (including border) so that the button height is 32px. Also adjusts the border width for all buttons when the state is `hover`, `focus`, or `active to be 2px thick instead of 1px thick. This is accomplished through an inset box-shadow as not to increase the size of the button. Fixes some colors for primary and tertiary buttons.
* | | | | | | | | | | Review Tools: Add large z-index to toolbarSarah Groff Hennigh-Palermo2019-07-111-0/+1
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'banzai-avoid-redis-if-db-cache' into 'master'Douwe Maan2019-07-112-2/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Banzai - avoid redis if attr is in DB cache See merge request gitlab-org/gitlab-ce!30334
| * | | | | | | | | Banzai - avoid redis if attr is in DB cachebanzai-avoid-redis-if-db-cacheMario de la Ossa2019-07-102-2/+16
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cache_collection_render runs we end up reading and writing things to redis even if we already have the rendered field cached in the DB. This commit avoids using redis at all whenever we have the field already rendered in the DB cache.
* | | | | | | | | Add text-secondary to controls containerMartin Wortschack2019-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add changelog entry
* | | | | | | | | Merge branch '64314-ci-icon' into 'master'Kushal Pandya2019-07-113-12/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align CI icon in merge request dashboard Closes #64314 See merge request gitlab-org/gitlab-ce!30558
| * | | | | | | | | Align items in merge request dashboard64314-ci-iconFilipa Lacerda2019-07-103-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vertically aligns ci icon, avatar, and comments icons in the merge request dashboard by using flex
* | | | | | | | | | Merge branch '62088-search-back' into 'master'Mike Greiling2019-07-113-4/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed back navigation for projects filter Closes #62088 See merge request gitlab-org/gitlab-ce!30373
| * | | | | | | | | Fixed back navigation for projects filter62088-search-backDenys Mishunov2019-07-053-4/+13
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filterable list now sends request to filter the projects list explicitly with `json` extension to avoid breakage when navigating back from a project to the filtered project's list.
* | | | | | | | | Merge branch 'sl-stablise-basic-login-spec' into 'master'Dan Davison2019-07-101-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix basic login test stability Closes gitlab-org/quality/staging#57 See merge request gitlab-org/gitlab-ce!30446
| * | | | | | | | | Revert to using retry_untilsl-stablise-basic-login-specSanad Liaquat2019-07-091-1/+1
| | | | | | | | | |
* | | | | | | | | | Add support for additional panel typesJose Ivan Vargas2019-07-1013-69/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces the single stat chart component aside from the area chart component
* | | | | | | | | | Merge branch 'fix_simple_format_undefined' into 'master'Robert Speicher2019-07-101-4/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix `simple_format` undefined error #60179 Closes #60179 See merge request gitlab-org/gitlab-ce!30366
| * | | | | | | | | | Extract plain file rendering into a separate methodVasiliy Yakliushin2019-07-071-3/+7
| | | | | | | | | | |
| * | | | | | | | | | Fix undefined method `simple_format for MarkupHelper:ModuleVasiliy Yakliushin2019-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `simple_format` is not defined in ActionView::Helpers::TagHelper, but it is actually located in ActionView::Helpers::TextHelper. The solution is to include the correct helper. I've also added tests for `#markup_unsafe` because they were missing.
* | | | | | | | | | | Add a rubocop for Rails.loggerMayra Cabrera2019-07-1046-49/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggests to use a JSON structured log instead Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/54102
* | | | | | | | | | | Merge branch ↵Stan Hu2019-07-102-3/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'backstage/gb/improve-performance-environment-statuses-endpoint' into 'master' Improve performance of fetching environments statuses Closes #62589 See merge request gitlab-org/gitlab-ce!30560
| * | | | | | | | | | | Resolve Gitaly N+1 for CI/CD environments statusesGrzegorz Bizon2019-07-101-2/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Add additional test case for Gitaly N+1 for diff filesGrzegorz Bizon2019-07-101-1/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Remove deleteNote from notes serviceWinnie Hellmann2019-07-102-4/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '63044-cluster-health-group-refactor' into 'master'Douglas Barbosa Alexandre2019-07-102-63/+72
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor common_metrics importer into a more extensible pattern Closes #63044 See merge request gitlab-org/gitlab-ce!30012
| * | | | | | | | | | | Refactor common metrics importerRyan Cobb2019-07-092-63/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors common metrics importer for two reasons. 1. To create a new pattern that can be followed by future importers that will minimize dependency collision and 2. To allow EE to more easily extend dependencies.
* | | | | | | | | | | | Merge branch 'prepare-cycle-analytics-for-group-level' into 'master'Douglas Barbosa Alexandre2019-07-105-48/+51
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare cycle analytics for group level See merge request gitlab-org/gitlab-ce!30356
| * | | | | | | | | | | | Add newline before subjectprepare-cycle-analytics-for-group-levelMałgorzata Ksionek2019-07-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rubocop offences
| * | | | | | | | | | | | Add attribute reader to project levelMałgorzata Ksionek2019-07-101-4/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add cr remarksMałgorzata Ksionek2019-07-092-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add code review remarksMałgorzata Ksionek2019-07-092-11/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Update controllers method callsMałgorzata Ksionek2019-07-092-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move cycle analytics model to separate namespaceMałgorzata Ksionek2019-07-093-46/+53
| | | | | | | | | | | | |
* | | | | | | | | | | | | Added css class to fix line wrap for assignee label in issuesMarc Schwede2019-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #64331
* | | | | | | | | | | | | Merge branch 'mf-modal-style-border-radius' into 'master'Annabel Dunstone Gray2019-07-102-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust modal border radius to match design spec See merge request gitlab-org/gitlab-ce!30414
| * | | | | | | | | | | | | Define modal first and last child border-radiusmf-modal-style-border-radiusmfluharty2019-07-092-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use $modal-border-radius for all modal border radius definitions