summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 'mw-project-list-color-fix' into 'master'Kushal Pandya2019-07-112-1/+6
|\ | | | | | | | | Project list: Add text-secondary to controls container See merge request gitlab-org/gitlab-ce!30567
| * Add text-secondary to controls containerMartin Wortschack2019-07-112-1/+6
|/ | | | - Add changelog entry
* Merge branch '64314-ci-icon' into 'master'Kushal Pandya2019-07-114-12/+17
|\ | | | | | | | | | | | | 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-104-12/+17
| | | | | | | | | | Vertically aligns ci icon, avatar, and comments icons in the merge request dashboard by using flex
* | Merge branch 'issue_57694' into 'master'Sean McGivern2019-07-118-0/+670
|\ \ | | | | | | | | | | | | | | | | | | Improve Graphql Docs Closes #57694 See merge request gitlab-org/gitlab-ce!29998
| * | Improve Graphql DocsFelipe Artur2019-07-118-0/+670
|/ / | | | | | | Adds more friendly docs for GraphQl implementation
* | Merge branch 'bvl-link-phab-users' into 'master'James Lopez2019-07-1117-21/+500
|\ \ | | | | | | | | | | | | | | | | | | Fetch users from Phabricator + link to issues Closes #60565 See merge request gitlab-org/gitlab-ce!30321
| * | Fetch users from Phabricator to link to issuesBob Van Landuyt2019-07-1017-21/+500
| | | | | | | | | | | | | | | | | | | | | | | | | | | We fetch the users from Phabricator based on their Phabricator ID. If a user with the same username exists and is a member of the project, we set them as assignee or author. When a user is applicable, we also cache it in Redis so we don't have to perform the request again for the same phid.
* | | Merge branch '62088-search-back' into 'master'Mike Greiling2019-07-116-4/+102
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-056-4/+102
| | | | | | | | | | | | | | | | | | | | | | | | 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 'docs-update-qa-readme-gdk-port' into 'master'Mark Lapierre2019-07-111-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update qa/README.md GDK port See merge request gitlab-org/gitlab-ce!30596
| * | | | Update qa/README.md GDK portMark Lapierre2019-07-111-4/+4
|/ / / /
* | | | Merge branch 'sh-bump-rspec-versions' into 'master'Mayra Cabrera2019-07-106-26/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Upgrade rspec-rails to 3.8.2 and dependencies See merge request gitlab-org/gitlab-ce!28378
| * | | | Upgrade rspec-rails to 3.8.2 and dependenciessh-bump-rspec-versionsDouglas Barbosa Alexandre2019-07-106-26/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings the rspec-core version in line with the Gitaly changes and introduces Rails 5.1/5.2 improvements. Full CHANGELOG: https://github.com/rspec/rspec-rails/blob/master/Changelog.md
* | | | | Merge branch 'sl-stablise-basic-login-spec' into 'master'Dan Davison2019-07-106-17/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-093-4/+6
| | | | | |
| * | | | | Use retry on exceptionSanad Liaquat2019-07-092-4/+2
| | | | | |
| * | | | | Retry sign out if unsuccessfulSanad Liaquat2019-07-094-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | Also extract retry_until into qa/qa/support/retrier.rb
* | | | | | Merge branch 'jivanvl-support-additional-panel-types' into 'master'Fatih Acet2019-07-1017-75/+280
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support additional panel types Closes #60008 See merge request gitlab-org/gitlab-ce!30001
| * | | | | | Add support for additional panel typesJose Ivan Vargas2019-07-1017-75/+280
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This introduces the single stat chart component aside from the area chart component
* | | | | | Merge branch 'fix_simple_format_undefined' into 'master'Robert Speicher2019-07-102-5/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-072-2/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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.
* | | | | | | Merge branch '54102-add-rubocop-for-rails-logger' into 'master'Stan Hu2019-07-10101-112/+233
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a Rubocop cop for Rails.logger Closes #54102 See merge request gitlab-org/gitlab-ce!30415
| * | | | | | | Add a rubocop for Rails.loggerMayra Cabrera2019-07-10101-112/+233
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggests to use a JSON structured log instead Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/54102
* | | | | | | Merge branch 'docs-code-block-style-3' into 'master'Achilleas Pipinellis2019-07-1015-429/+434
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix whitespace in many administration docs (part 2) See merge request gitlab-org/gitlab-ce!30555
| * | | | | | | Fix whitespace in many administration docsMarcel Amirault2019-07-1015-429/+434
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 (part 2)
* | | | | | | Merge branch 'docs/edit-graphql' into 'master'Achilleas Pipinellis2019-07-102-6/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit GraphQL general availability text See merge request gitlab-org/gitlab-ce!30541
| * | | | | | | Edit GraphQL general availability textEvan Read2019-07-102-6/+7
|/ / / / / / /
* | | | | | | Merge branch 'docs-move-pgbouncer-ha-docs-out-of-db-docs' into 'master'Achilleas Pipinellis2019-07-102-83/+83
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving Pgbouncer HA documentation out of database documentation Closes #63540 See merge request gitlab-org/gitlab-ce!30471
| * | | | | | | Moving Pgbouncer HA documentation out of database documentationdocs-move-pgbouncer-ha-docs-out-of-db-docsabuerer2019-07-092-83/+83
| | | | | | | |
* | | | | | | | Merge branch ↵Stan Hu2019-07-104-12/+67
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | | | | Add changelog for ci/cd environments Gitaly N+1 fixbackstage/gb/improve-performance-environment-statuses-endpointGrzegorz Bizon2019-07-101-0/+5
| | | | | | | | |
| * | | | | | | | Resolve Gitaly N+1 for CI/CD environments statusesGrzegorz Bizon2019-07-102-4/+3
| | | | | | | | |
| * | | | | | | | Add additional test case for Gitaly N+1 for diff filesGrzegorz Bizon2019-07-102-37/+70
| | | | | | | | |
| * | | | | | | | Add a test for `ci_environments_status` Gitaly N+1Grzegorz Bizon2019-07-101-16/+34
| | | | | | | | |
* | | | | | | | | Merge branch 'rf-optional-pipeline-for-vulnerabilities-api' into 'master'Douwe Maan2019-07-101-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vulnerabilities API now supports pipeline_id See merge request gitlab-org/gitlab-ce!30086
| * | | | | | | | | Vulnerabilities API now supports pipeline_idrossfuhrman2019-07-101-0/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'winh-notes-service-deleteNote' into 'master'Clement Ho2019-07-104-15/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deleteNote from notes service See merge request gitlab-org/gitlab-ce!30537
| * | | | | | | | | Remove deleteNote from notes serviceWinnie Hellmann2019-07-104-15/+15
|/ / / / / / / / /
* | | | | | | | | Merge branch 'project-dashboards-docs' into 'master'Achilleas Pipinellis2019-07-101-1/+64
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs on project-based dashboard config See merge request gitlab-org/gitlab-ce!28154
| * | | | | | | | | Add docs on project-based dashboard configSarah Yasonik2019-07-101-1/+64
|/ / / / / / / / /
* | | | | | | | | Merge branch '62363-follow-up-from-move-more-project-routes-under-scope' ↵Lin Jen-Shin2019-07-101-0/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add controller spec for deploy tokens Closes #62363 See merge request gitlab-org/gitlab-ce!30311
| * | | | | | | | Add routing spec for deploy_tokens controllerDmitriy Zaporozhets2019-07-101-0/+6
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch '63044-cluster-health-group-refactor' into 'master'Douglas Barbosa Alexandre2019-07-1016-208/+235
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor common_metrics importer into a more extensible pattern Closes #63044 See merge request gitlab-org/gitlab-ce!30012
| * | | | | | | | Remove unnecessary let in spec63044-cluster-health-group-refactorRyan Cobb2019-07-091-6/+3
| | | | | | | | |
| * | | | | | | | Remove unnecessary rubocop disableRyan Cobb2019-07-091-2/+0
| | | | | | | | |
| * | | | | | | | Rename Gitlab::Importers moduleRyan Cobb2019-07-0913-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to avoid confusion between Gitlab::Importers module and other like named modules, this renamed it to Gitlab::DatabaseImporters.
| * | | | | | | | Remove prepending of EE moduleRyan Cobb2019-07-091-2/+0
| | | | | | | | |