summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Cache diff highlighting upon Merge Request creation (refactors diff caching)Oswaldo Ferreira2018-09-071-0/+2
|
* Merge branch 'sh-set-secure-cookies' into 'master'Rémy Coutable2018-09-042-5/+10
|\ | | | | | | | | | | | | Set issuable_sort and diff_view cookies to secure when possible Closes #49120 See merge request gitlab-org/gitlab-ce!21442
| * Set issuable_sort and diff_view cookies to secure when possibleStan Hu2018-09-032-5/+10
| | | | | | | | Closes #49120
* | Move badge settings to general settingsWinnie Hellmann2018-09-034-26/+4
| |
* | Added atom feed for tagsFrancisco Javier López2018-09-031-0/+5
| |
* | Use a serializer to render diff linesFelipe Artur2018-08-311-1/+1
|/
* Resolve "Persistent banner creates problem for web ide"Paul Slaughter2018-08-311-1/+1
|
* Fixed project logo when it is LFS trackedFrancisco Javier López2018-08-303-45/+73
|
* Merge branch 'issue_36138' into 'master'Sean McGivern2018-08-281-3/+14
|\ | | | | | | | | | | | | Allow to delete group milestones Closes #36138 See merge request gitlab-org/gitlab-ce!21057
| * Allow to delete group milestonesissue_36138Felipe Artur2018-08-061-3/+14
| |
* | Allows author to vote on their own issueChantal Rollison2018-08-241-1/+1
| |
* | Merge branch ↵Nick Thomas2018-08-231-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '43096-controller-projects-issuescontroller-referenced_merge_requests-json-executes-more-than-100-sql-queries' into 'master' Resolve "Controller Projects::IssuesController#referenced_merge_requests.json executes more than 100 SQL queries" Closes #43096 See merge request gitlab-org/gitlab-ce!21237
| * | Move Issue#{referenced,closed_by}_merge_requests to serviceSean McGivern2018-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | These methods don't really need to be on the Issue model. Issue#related_branches can also be moved to a service, but we can do that in a separate commit. This commit does not change any behaviour; it just moves code around, renames the service, and refactors the specs.
* | | Speed up diff comparisons by limiting number of commit messages renderedStan Hu2018-08-225-4/+24
| | | | | | | | | | | | | | | | | | | | | When a diff has a significant number of commits, the previous behavior would attempt to render the Markdown on all the commit messages but only display 1000 of them. To avoid additional work, we only need to render the Markdown on the set that is displayed.
* | | Merge branch '41441-add-target-branch-name-to-cherrypick-confirmation' into ↵Sean McGivern2018-08-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Cherry-picking: Confirmation message should include target branch name" Closes #41441 See merge request gitlab-org/gitlab-ce!20846
| * | | Fix branch name in case of new merge request cherry pickGeorge Andrinopoulos2018-08-191-1/+1
| | | |
| * | | Add target branch to cherry pick confirmation messageGeorge Andrinopoulos2018-08-191-1/+1
| | | |
* | | | Resolve "Separate remembering sorting issues/merge requests"🙈 jacopo beschi 🙉2018-08-211-10/+12
| | | |
* | | | Refactor AutocompleteControllerdefine-abstraction-levelsYorick Peterse2018-08-201-50/+22
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors the AutocompleteController according to the guidelines and boundaries discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/49653. Specifically, ActiveRecord logic is moved to different finders, which are then used in the controller. View logic in turn is moved to presenters, instead of directly using ActiveRecord's "to_json" method. The finder MoveToProjectFinder is also adjusted according to the abstraction guidelines and boundaries, resulting in a much more simple finder. By using finders (and other abstractions) more actively, we can push a lot of logic out of the controller. We also remove the need for various "before_action" hooks, though this could be achieved without using finders as well. The various finders related to AutcompleteController have also been moved into a namespace. This removes the need for calling everything "AutocompleteSmurfFinder", instead you can use "Autocomplete::SmurfFinder".
* | | Whitelist existing destroy_all offensesblacklist-destroy-allYorick Peterse2018-08-161-1/+1
|/ / | | | | | | This whitelists all existing places where we use "destroy_all".
* | Add email_events to replace EMAIL_EVENTS because it needs to be dynamic,Mark Chao2018-08-141-4/+4
| | | | | | allowing override for EE.
* | Merge branch 'sh-fix-issue-50210-oauth2' into 'master'Robert Speicher2018-08-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix logins via OAuth2 geting logged out in an hour Closes #50210 See merge request gitlab-org/gitlab-ce!21144
| * | Fix logins via OAuth2 geting logged out in an hourStan Hu2018-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users without GitLab 2FA enabled would be logged out after an hour due to a regression in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20700. The OAuth2 controller sets the current_user after the controller is finished, so we should only limit session times after this has been done. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50210
* | | Implement QuickActions::TargetServicePeter Leitzen2018-08-101-2/+4
| | |
* | | Move finding autocompletion targets into AutocompleteServicePeter Leitzen2018-08-101-9/+2
| | |
* | | Build noteables in AutocompleteSourcesController#targetPeter Leitzen2018-08-101-2/+2
|/ /
* | Merge branch '35952-keep-project-repository-settings-open-after-submit' into ↵Tim Zallmann2018-08-085-14/+14
|\ \ | | | | | | | | | | | | | | | | | | 'master' Keep project repository settings sections expanded after submitting form See merge request gitlab-org/gitlab-ce!21082
| * | ensure all project repository settings panels remain open after form submissionMike Greiling2018-08-085-14/+14
| | |
* | | Keep project settings sections expanded after submitting formMike Greiling2018-08-082-7/+7
| | |
* | | Merge branch '35952-keep-group-settings-open-after-submit' into 'master'Tim Zallmann2018-08-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Keep group settings sections expanded after submitting form See merge request gitlab-org/gitlab-ce!21083
| * | | ensure all group settings panels remain open after form submissionMike Greiling2018-08-081-1/+1
| |/ /
* | | Merge branch '35952-keep-project-cicd-settings-open-after-submit' into 'master'Tim Zallmann2018-08-072-8/+8
|\ \ \ | | | | | | | | | | | | | | | | Keep project CI/CD settings sections expanded after submitting form See merge request gitlab-org/gitlab-ce!21077
| * | | keep pipeline triggers settings panel open after form submissionMike Greiling2018-08-071-5/+5
| | | |
| * | | keep cicd runner settings panel open after form submissionMike Greiling2018-08-071-3/+3
| |/ /
* | | Don't set gon variables in JSON requestsPeter Leitzen2018-08-071-2/+6
|/ /
* | Squashed commit of the following:Shinya Maeda2018-08-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 610c02c305d9fb3c7d271883450a5fee8b0cf16f Merge: f2088edb260 84f24dcef0d Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 23:01:38 2018 +0900 Merge branch 'master-ce' into improve-junit-support-be commit f2088edb26008e5791b7be86fc02fc470c881143 Merge: c67e1d32cac 339f47abec1 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 21:52:10 2018 +0900 Merge branch 'improve-junit-support-be' of gitlab.com:gitlab-org/gitlab-ce into improve-junit-support-be commit c67e1d32cac731b895e2f49a24ce0e1726b8196c Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 21:51:39 2018 +0900 Remove debuggable fixtures commit 339f47abec1d0ce815e6103a087902d71d8ff5be Merge: 7a33a9be724 96b748fbcc0 Author: Filipa Lacerda <filipa@gitlab.com> Date: Tue Aug 7 11:10:18 2018 +0100 Merge branch 'improve-junit-support-be' of https://gitlab.com/gitlab-org/gitlab-ce into improve-junit-support-be * 'improve-junit-support-be' of https://gitlab.com/gitlab-org/gitlab-ce: Add spec for latest Add spec for merge request Add spec for cache invalidation Add spec for pipeline Add spec Fix specs Support corrupted fixtures Add cache key to error message commit 7a33a9be724dbde79a24cec77658952ff2d2fa6c Author: Filipa Lacerda <filipa@gitlab.com> Date: Tue Aug 7 11:09:56 2018 +0100 Show resolved failures commit 96b748fbcc00a98a13aeb78f5d97de9cf25035b6 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 18:50:05 2018 +0900 Add spec for latest commit 0e8b024169b4b0ac272331117ac2fa821c4052f7 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 18:24:38 2018 +0900 Add spec for merge request commit 8690a699bc98394ad4deebdc91e6690758c5965e Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 18:18:55 2018 +0900 Add spec for cache invalidation commit 97678e1612826af409ca8a04b6c0dc830f7b66c6 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 18:01:03 2018 +0900 Add spec for pipeline commit 96c2a698af049e4026c68e74b1f41a265464b2b2 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 17:52:21 2018 +0900 Add spec commit 67bcbd25a3c13abb78ea43c0411f5aed417b87d0 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 17:39:02 2018 +0900 Fix specs commit d7d49def2023f85c07d2718b83f35c8849f65f05 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 13:11:07 2018 +0900 Support corrupted fixtures commit d58dbbc17a7d954db22082615f5331c148c1061b Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 13:10:47 2018 +0900 Add cache key to error message commit f6f976216dc36333b5e05e3f0acdfca689350483 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Aug 2 19:07:46 2018 +0900 bring back debaggable fixtures commit 48a7800e67a718145c0e88c324c0c1f9619e26a4 Merge: 2822b9e8a36 dd627072b3f Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Aug 7 09:22:22 2018 +0900 Merge branch 'master-ce' into improve-junit-support-be commit 2822b9e8a369162d098a72a58803c8494b2343cd Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 22:54:47 2018 +0900 Move cache invalidation policy to outside of reactive cache commit b35efb1764ae61bb31dacbf79dbc022dcee3a203 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 22:34:10 2018 +0900 ADd reactive cache an ability to invalite cache commit feafee6f8a50f4a32866d8ae768e99766b0b7c73 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 19:25:22 2018 +0900 Pipeline has test reports if latest builds have any commit f302dbb73abe03c6c431e7d52d526e28a1586fee Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 19:18:56 2018 +0900 Invalidate test reports cache if it's outdated commit 83adaca01a1ee1cd64cac86b6fa3d10e2e4e2b98 Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 18:08:06 2018 +0900 Revert cache invalidation in expire pipeline cache worker commit ec3af5de4ca34e2e92ad6b97f29733d6c65062bc Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 15:13:47 2018 +0900 Fix feature spec commit 0db48805a1ba68763be0504eb57218bde2380e4b Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 14:07:46 2018 +0900 Change lifetime of test reports cache to 10 minutes commit 17f7e78bfe2188c349cda1ff90a3ea94d337461e Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 14:07:19 2018 +0900 Add changelog commit 89c87585ab7f5333a8139c02b330dd2caf0be31a Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 14:01:20 2018 +0900 Add feature spec commit 1120cfd7a9ab06105f2e763c375fab00922b7e0c Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Aug 6 12:55:47 2018 +0900 Invalidate cache when pipeline status transits. Correct test reports from the latest builds
* | Merge branch 'group-todos' into 'master'Sean McGivern2018-08-073-11/+17
|\ \ | | | | | | | | | | | | Group todos See merge request gitlab-org/gitlab-ce!20675
| * | Revert "Revert "Merge branch 'ee-5481-epic-todos' into 'master'""Jarka Kadlecová2018-08-023-11/+17
| | | | | | | | | | | | This reverts commit 8717c7dad9b5a8fa21ec9a652c54718a6b4c2175.
* | | Merge branch 'sh-support-bitbucket-server-import' into 'master'Tim Zallmann2018-08-062-0/+136
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for Bitbucket Server imports Closes #25393 See merge request gitlab-org/gitlab-ce!20164
| * | | Assorted Bitbucket Server importer code cleanup based on reviewStan Hu2018-08-011-1/+1
| | | |
| * | | Remove extra space in app/controllers/import/bitbucket_server_controller.rbStan Hu2018-08-011-1/+1
| | | |
| * | | Inline repo_owner in app/controllers/import/bitbucket_server_controller.rbStan Hu2018-08-011-3/+1
| | | |
| * | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-311-1/+6
| |\ \ \
| * \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-317-23/+55
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-273-5/+27
| |\ \ \ \ \
| * | | | | | Fix Rubocop errorStan Hu2018-07-271-1/+1
| | | | | | |
| * | | | | | Consolidate validation logicStan Hu2018-07-261-5/+8
| | | | | | |
| * | | | | | Consolidate server errors and add specsStan Hu2018-07-261-12/+2
| | | | | | |
| * | | | | | Remove unnecessary guard clauseStan Hu2018-07-251-2/+0
| | | | | | |
| * | | | | | Add frozen_string_literal: true to controllerStan Hu2018-07-251-0/+2
| | | | | | |