summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Remove caching of CSV file49231-import-issues-csvHeinrich Lee Yu2019-01-071-3/+3
| | | | Load whole file in memory to simplify code
* Improve email messagesHeinrich Lee Yu2019-01-071-2/+2
| | | | Also refactored cleanup view to use the same localized string
* Refactor upload service to return uploaderHeinrich Lee Yu2019-01-072-6/+6
| | | | Also changes old calls to the service
* Import CSV BackendHeinrich Lee Yu2019-01-071-6/+15
| | | | Process CSV uploads async using a worker then email results
* Add Import CSV FrontendHeinrich Lee Yu2019-01-071-3/+10
| | | | Added button and modal to accept CSV file for uploading
* Move settings operations controller from EE to CEmove-settings-oprations-to-cePeter Leitzen2019-01-061-0/+39
| | | | | This commit prepares the structure for the upcoming feature error tracking.
* Merge branch 'dm-git-access-any-ce' into 'master'Sean McGivern2019-01-041-3/+1
|\ | | | | | | | | [CE] Don't run checks for changed refs when specific changes are unknown See merge request gitlab-org/gitlab-ce!23990
| * Move magic '_any' string to constantDouwe Maan2019-01-021-3/+1
| |
* | Merge branch 'ccr/49289_milestone_link' into 'master'Mike Greiling2019-01-021-8/+13
|\ \ | | | | | | | | | | | | | | | | | | Add project milestone link Closes #49289 See merge request gitlab-org/gitlab-ce!22552
| * | Add project milestone link to dashboard milestonesccr/49289_milestone_linkFatih Acet2018-12-201-8/+13
| | | | | | | | | | | | | | | | | | One of the steps to deprecate dashboard milestones. Links do dashboard milestone are replaced with links for each project milestone
* | | Fix deprecation: redirect_to :back is deprecatedJasper Maes2019-01-023-3/+3
| |/ |/|
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJohn Jarvis2019-01-014-5/+19
|\ \
| * \ Merge branch 'security-refs-available-to-project-guest' into 'master'John Jarvis2019-01-011-0/+1
| |\ \ | | | | | | | | | | | | | | | | [master] Project guests no longer are able to see refs page See merge request gitlab/gitlabhq!2685
| | * | Project guests no longer are able to see refs pageTiago Botelho2018-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Adds download_code authorization check to ProjectsController#refs action, to prevent a project guest from seeing branch, tags and commits information
| * | | Merge branch 'security-48259-private-snippet' into 'master'John Jarvis2019-01-012-2/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | [master] Prevent private snippet from being embeddable See merge request gitlab/gitlabhq!2692
| | * | | Block private snippets from being embeddableMark Chao2018-12-202-2/+15
| | | |/ | | |/|
| * | | Merge branch 'security-master-group-cicd-settings-accessible-to-maintainer' ↵John Jarvis2019-01-011-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' [master] Group Ex-Maintainer Could maintain Access to Project's Source Code/Jobs/Pipelines/Artifacts if it had Shared Group Runner Configured See merge request gitlab/gitlabhq!2721
| | * | | Check for group admin permissionsMatija Čupić2018-12-201-3/+3
| | |/ /
* | | | Add spec for Release APIShinya Maeda2018-12-312-3/+10
| | | | | | | | | | | | | | | | | | | | Add spec for all release API - GET, POST, PUT, DELETE. Also, fixes some minior bugs.
* | | | Refactor Release servicesAlessio Caiazza2018-12-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | CreateReleaseService and UpdateReleaseService now takes all the release attributes as constructor parameters. This will simplify attribute expansion
* | | | Add releases APIAlessio Caiazza2018-12-313-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces Releases API under /api/v4/projects/:id/releases * We are introducing release policies at project level. * We are deprecating releases changes from tags, both api and web interface. * Tags::CreateService no longer create a release This feature is controlled by :releases_page feature flag
* | | | Fixing image lfs bug and also displaying text lfsFrancisco Javier López2018-12-271-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812, fixes a problem creating a displaying image diff notes when the image is stored in LFS. The main problem was that `Gitlab::Diff::File` was returning an invalid valid in `text?` for this kind of files. It also fixes a rendering problem with other LFS files, like text ones. They LFS pointer shouldn't be shown when LFS is enabled for the project, but they were.
* | | Merge branch 'osw-cache-discussions-diff-highlighting' into 'master'Douwe Maan2018-12-271-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Considerably improve the loading time on merge request's discussion page Closes #52950 See merge request gitlab-org/gitlab-ce!23857
| * | | Cache diff highlight in discussionsOswaldo Ferreira2018-12-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit handles note diffs caching, which considerably improves the performance on merge requests with lots of comments. Important to note that the caching approach taken here is different from `Gitlab::Diff::HighlightCache`. We do not reset the whole cache when a new push is sent or anything else. That's because discussions diffs are persisted and do not change.
* | | | Merge branch '44984-use-serializer-for-issuable-sidebar' into 'master'Mike Greiling2018-12-213-11/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "Create a serializer to render issuables sidebar" Closes #44984 See merge request gitlab-org/gitlab-ce!23379
| * | | Code style changes and refactorHeinrich Lee Yu2018-12-201-1/+1
| | | |
| * | | Refactor sidebar to use data from serializerHeinrich Lee Yu2018-12-193-11/+13
| | |/ | |/|
* | | Merge branch 'ce-8333-add-related-epics-support' into 'master'Dmitriy Zaporozhets2018-12-202-3/+3
|\ \ \ | |_|/ |/| | | | | | | | CE port: Rename GroupHierarchy into ObjectHierarchy See merge request gitlab-org/gitlab-ce!23923
| * | Rename GroupHierarchy into ObjectHierarchyJarka Košanová2018-12-192-3/+3
| |/ | | | | | | | | | | - we now use the hierarchy class also for epics - also rename supports_nested_groups? into supports_nested_objects? - move it to a concern
* | Merge branch 'ce-reduce-deploy_keys_controller-diff-with-ce' into 'master'Robert Speicher2018-12-191-1/+1
|\ \ | | | | | | | | | | | | Make Projects::DeployKeysController EE-ready See merge request gitlab-org/gitlab-ce!23911
| * | Make Projects::DeployKeysController EE-readyRémy Coutable2018-12-191-1/+1
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Make LfsRequest EE-compatibleRémy Coutable2018-12-191-0/+6
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'reduce-diff-with-ee-in-protected_refs_controller' into 'master'Douwe Maan2018-12-183-2/+10
|\ | | | | | | | | Reduce diff with EE in ProtectedRefsController See merge request gitlab-org/gitlab-ce!23885
| * Reduce diff with EE in ProtectedRefsControllerRémy Coutable2018-12-173-2/+10
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Remove content disposition attachment displaying all ssh keysFrancisco Javier López2018-12-181-1/+0
| |
* | Merge branch ↵Lin Jen-Shin2018-12-181-1/+7
|\ \ | | | | | | | | | | | | | | | | | | 'ce-6635-extract-ee-specific-files-lines-for-app-controllers-admin-health_check_controller-rb' into 'master' Make Admin::HealthCheckController EE-compatible See merge request gitlab-org/gitlab-ce!23879
| * | Make Admin::HealthCheckController EE-compatibleRémy Coutable2018-12-171-1/+7
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '41766-create-releases-page' into 'master'Kamil Trzciński2018-12-183-30/+49
|\ \ | | | | | | | | | | | | Creates index page for releases behind a feature flag See merge request gitlab-org/gitlab-ce!23687
| * | Move Projects::ReleasesController under TagsAlessio Caiazza2018-12-183-36/+45
| | | | | | | | | | | | | | | Rename Projects::ReleasesController to Projects::Tags::ReleasesController
| * | Adds releases index routeFilipa Lacerda2018-12-181-3/+13
| | | | | | | | | | | | | | | | | | Renders empty index page Adds Releases entry to the navigation bar behind a feature flag Renders 404 when feature flag for releases is not enabled
* | | Merge branch 'reduce-imports_controller-diff-with-ce' into 'master'Lin Jen-Shin2018-12-181-5/+5
|\ \ \ | |/ / |/| | | | | | | | Make Projects::ImportsController EE-compatible See merge request gitlab-org/gitlab-ce!23883
| * | Make Projects::ImportsController EE-compatibleRémy Coutable2018-12-171-5/+5
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'fj-fix-action-name-jobscontroller' into 'master'Rémy Coutable2018-12-181-1/+1
|\ \ | | | | | | | | | | | | Fixed action name in JobsController See merge request gitlab-org/gitlab-ce!23888
| * | Fixed action name in JobsControllerFrancisco Javier López2018-12-171-1/+1
| |/
* | Use the EE version of ServiceParamsRémy Coutable2018-12-171-1/+5
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '55230-remove-project-cleanup-feature-flag' into 'master'Douwe Maan2018-12-171-5/+0
|\ | | | | | | | | | | | | Remove the project_cleanup feature flag Closes #55230 See merge request gitlab-org/gitlab-ce!23814
| * Remove the project_cleanup feature flagNick Thomas2018-12-151-5/+0
| |
* | Merge branch 'remove-rails4-specific-code' into 'master'Rémy Coutable2018-12-172-31/+1
|\ \ | | | | | | | | | | | | Remove rails4 specific code See merge request gitlab-org/gitlab-ce!23847
| * | Remove rails4 specific codeJasper Maes2018-12-162-31/+1
| |/
* | Use finder to decide to show note to userThong Kuah2018-12-171-1/+13
| | | | | | | | | | | | | | | | | | | | | | Given the note is about how to interpret ancestor clusters, use the finder which actually knows if there are any ancestor clusters to find out if the note should be shown, rather than passing the same info via a view to a helper Added note about Kaminari.paginate_array Link to followup issue too