summaryrefslogtreecommitdiff
path: root/spec/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Filipa Lacerda2019-01-231-3/+3
|\ | | | | | | | | | | | | | | | | '25569-changing-wording-to-delete-when-referring-to-removing-a-branch' into 'master' Resolve "Changing wording to "Delete" when referring to removing a branch" Closes #25569 See merge request gitlab-org/gitlab-ce!23966
| * Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branchSam Bigelow2019-01-221-3/+3
| | | | | | | | This is to match `git branch -D <branchname>`
* | Merge branch 'tz-user-avatar-caching' into 'master'Sean McGivern2019-01-221-4/+10
|\ \ | | | | | | | | | | | | Changed the Caching of User Avatars to be public and to 5 minutes See merge request gitlab-org/gitlab-ce!24546
| * | Turned cache_privately? into cache_publicly?Tim Zallmann2019-01-221-1/+0
| | | | | | | | | Also removed unnecessary comment
| * | Fixed static analysis error and 2 caching specsTim Zallmann2019-01-211-5/+5
| | |
| * | Changed the Caching of User Avatars to be public and to 5 minutesTim Zallmann2019-01-211-1/+8
| | |
* | | Add ability to resolve project id into pathDmitriy Zaporozhets2019-01-221-0/+53
|/ / | | | | | | | | | | | | | | | | By visiting `projects/:id` you will be redirected to project page with path in it. projects/123 => foo/bar Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch '56213-remove-error_tracking-feature-flag' into 'master'Kamil Trzciński2019-01-192-36/+0
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Remove `error_tracking` feature flag" Closes #56213 See merge request gitlab-org/gitlab-ce!24306
| * | Remove `error_tracking` feature flagPeter Leitzen2019-01-152-36/+0
| | | | | | | | | | | | | | | | | | | | | We introduced the feature flag `error_tracking` to test the Sentry MVC safely. After the successful test, we remove it again.
* | | Merge branch 'ce-issue_7526' into 'master'Fatih Acet2019-01-182-0/+2
|\ \ \ | | | | | | | | | | | | | | | | [EE Backport] Add notes filters for epics See merge request gitlab-org/gitlab-ce!24372
| * | | [EE Backport] Add notes filters for epicsFelipe Artur2019-01-142-0/+2
| | | |
* | | | Add flat-square badge styleFabian Schneider2019-01-181-2/+39
| | | |
* | | | Merge branch 'remove-issues-import-csv-feature-flag' into 'master'Sean McGivern2019-01-171-13/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove import_issues_csv feature flag See merge request gitlab-org/gitlab-ce!24324
| * | | | Remove import_issues_csv feature flagHeinrich Lee Yu2019-01-111-13/+0
| | | | | | | | | | | | | | | | | | | | Also remove test for the feature flag
* | | | | Merge branch 'ac-pages-subgroups' into 'master'Nick Thomas2019-01-161-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable Gitlab-Pages for subgroups See merge request gitlab-org/gitlab-ce!23505
| * | | | | Enable Gitlab-Pages for subgroupsAlessio Caiazza2019-01-141-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab Pages supports projects hosted under a subgroup, but not subgroup websites. That means that only the highest-level group supports i.e.: You created a group for your engineering department called `engineering`, a subgroup for all your documentation websites called `docs`,and a project within this subgroup is called `workflows`. Your project URL is `https://gitlab.com/engineering/docs/workflows/`. Once you enable GitLab Pages for this project, the site will live under `https://engineering.gitlab.io/docs/workflows`.
* | | | | Merge branch 'fix-403-page-is-rendered-but-404-is-the-response' into 'master'Lin Jen-Shin2019-01-161-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Show the correct error page when access is denied Closes #55110 See merge request gitlab-org/gitlab-ce!23932
| * | | | Show the correct error page when access is deniedLuke Bennett2019-01-151-0/+2
| | |/ / | |/| |
* | | | Merge branch 'remove-cancel-all-button-in-job-list-view' into 'master'Grzegorz Bizon2019-01-151-44/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Remove cancel all jobs button in general jobs list view Closes #34665 See merge request gitlab-org/gitlab-ce!24010
| * | | Remove cancel all action in Jobs ControllerJordi Llull2019-01-071-44/+0
| | | |
* | | | Merge branch 'sh-fix-bitbucket-server-error-handling' into 'master'Rémy Coutable2019-01-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Bitbucket Server importer error handling Closes #56154 See merge request gitlab-org/gitlab-ce!24343
| * | | | Fix Bitbucket Server importer error handlingStan Hu2019-01-121-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The importer would display a 500 error page if you attempted to import using a non-existent DNS entry. This commit rescues known network issues and consolidates them into BitbucketServer::Connection::ConnectionError`. The previous error handling in the paginator doesn't work because it returns a lazy collection. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56154
* | | | Update gitlab-styles to 2.5.1Jasper Maes2019-01-112-5/+5
|/ / /
* | | Remove releases_page feature flagShinya Maeda2019-01-111-16/+0
| | | | | | | | | | | | | | | | | | We introduced releases_page feature flag. Given this feature is deemed stable, we should remove this flag before 19th.
* | | Merge branch 'knative-show-page' into 'master'Mike Greiling2019-01-111-1/+37
|\ \ \ | | | | | | | | | | | | | | | | Initial Serverless Functions detailed view See merge request gitlab-org/gitlab-ce!23863
| * | | Initial Serverless Functions detailed viewChris Baumbauer2019-01-101-1/+37
| | |/ | |/|
* | | Merge branch 'iss-32584-preserve-line-number-fragment-after-redirect' into ↵Mike Greiling2019-01-101-0/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Preserve URL fragment across sign-in and sign-up redirects Closes #32584 See merge request gitlab-org/gitlab-ce!19165
| * | | Preserve URL fragment across sign-in and sign-up redirectsScott Escue2019-01-101-0/+34
| | | | | | | | | | | | | | | | If window.location contains a URL fragment, append the fragment to all sign-in forms, the sign-up form, and all button based providers.
* | | | Fix requests profiler in admin page not rendering HTML properlyStan Hu2019-01-091-0/+47
|/ / / | | | | | | | | | | | | | | | | | | | | | By default in Rails 5, content passed to `render` will be escaped. This doesn't work for the HTML profile output, which should be considered safe HTML already. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56152
* | | Service for calling Sentry issues apiReuben Pereira2019-01-091-0/+142
|/ /
* | Add committers and authors methods on MergeRequestTiago Botelho2019-01-081-1/+1
| | | | | | | | These are used by the EE-only approvers feature
* | Merge branch '49231-import-issues-csv' into 'master'Douwe Maan2019-01-071-0/+66
|\ \ | | | | | | | | | | | | | | | | | | Import issues from CSV Closes #49231 See merge request gitlab-org/gitlab-ce!23532
| * | Import CSV BackendHeinrich Lee Yu2019-01-071-0/+66
| |/ | | | | | | Process CSV uploads async using a worker then email results
* | Implement error tracking configurationPeter Leitzen2019-01-071-11/+157
|/ | | | Re-use operations controller which already handles tracing settings.
* Move settings operations controller from EE to CEmove-settings-oprations-to-cePeter Leitzen2019-01-061-0/+35
| | | | | This commit prepares the structure for the upcoming feature error tracking.
* Merge branch 'deprecated-positional-spec-arguments' into 'master'Lin Jen-Shin2019-01-034-9/+9
|\ | | | | | | | | Fix deprecation: Using positional arguments in integration tests See merge request gitlab-org/gitlab-ce!24110
| * Fix deprecation: Using positional arguments in integration testsJasper Maes2019-01-024-9/+9
| |
* | Merge branch 'ccr/49289_milestone_link' into 'master'Mike Greiling2019-01-022-2/+2
|\ \ | |/ |/| | | | | | | | | 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-202-2/+2
| | | | | | | | | | | | One of the steps to deprecate dashboard milestones. Links do dashboard milestone are replaced with links for each project milestone
* | Merge branch ↵Sean McGivern2019-01-021-1/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '55838-remove-gem-install-bundler-from-docker-based-ruby-environments' into 'master' Remove gem install bundler from Docker-based Ruby environments Closes #55838 See merge request gitlab-org/gitlab-ce!24093
| * | Remove gem install bundler from Docker-based Ruby environmentsTakuya Noguchi2019-01-011-1/+0
| | | | | | | | | | | | | | | | | | bundler gem has been included in the Docker official Ruby image since 2.1. Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | Merge branch 'security-refs-available-to-project-guest' into 'master'John Jarvis2019-01-011-4/+20
|\ \ \ | | | | | | | | | | | | | | | | [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-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | 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-0/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [master] Prevent private snippet from being embeddable See merge request gitlab/gitlabhq!2692
| * | | | Block private snippets from being embeddableMark Chao2018-12-202-0/+59
| | |_|/ | |/| |
* | | | Merge branch 'security-master-group-cicd-settings-accessible-to-maintainer' ↵John Jarvis2019-01-011-10/+45
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 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-10/+45
| |/ /
* | | Merge branch 'fj-remove-workhorse-set-content-type-feature-flag' into 'master'Douwe Maan2018-12-275-209/+44
|\ \ \ | | | | | | | | | | | | | | | | Removing workhorse_set_content_type feature flag See merge request gitlab-org/gitlab-ce!23930
| * | | Removing workhorse_set_content_type feature flagFrancisco Javier López2018-12-195-209/+44
| | |/ | |/| | | | | | | | | | Removing workhorse_set_content_type feature flag introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22667
* | | Merge branch 'osw-cache-discussions-diff-highlighting' into 'master'Douwe Maan2018-12-271-0/+64
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Considerably improve the loading time on merge request's discussion page Closes #52950 See merge request gitlab-org/gitlab-ce!23857
View Lorry Controller Status