Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/controllers
AgeCommit message (Collapse)Author
2018-06-27Specify environment actions to distinguish between metrics and every other ↵Tiago Botelho
environment related actions
2018-06-27Adds empty environments pageTiago Botelho
2018-06-27Adds metrics to Operartions tab in projects sidebarTiago Botelho
2018-06-26Merge branch 'patch-28' into 'master'Rémy Coutable
Update wrong initial setting transfer in application_settings_controller.rb See merge request gitlab-org/gitlab-ce!20059
2018-06-26Merge branch 'update_project_flash_error_message' into 'master'Rémy Coutable
Set flash error message only for current request when updating project Closes #43772 See merge request gitlab-org/gitlab-ce!20126
2018-06-25Fix initial settings loading at the first run of GitLab installed from sourceAndrei Vukolov
2018-06-25Bring changes from EELin Jen-Shin
2018-06-25Honor saml assurance level to allow 2FA bypassingRoger Rüttimann
2018-06-25Bring changes from EELin Jen-Shin
2018-06-25Set flash error message only for current request when updating projectAram Visser
2018-06-22Merge branch 'blackst0ne-fix-protect-from-forgery-in-application-controller' ↵Douwe Maan
into 'master' [Rails5] Force the `protect_from_forgery` callback run first Closes #48204 See merge request gitlab-org/gitlab-ce!20055
2018-06-22Show a reCAPTCHA on signin page if custom header is setStan Hu
This will only be displayed if `X-GitLab-Show-Login-Captcha` is set as an HTTP header.
2018-06-21Changes tab VUE refactoringFelipe Artur
2018-06-21Merge branch 'blackst0ne-rails5-set-request-format-in--commits-controller' ↵Rémy Coutable
into 'master' [Rails5] Set request.format in commits_controller Closes #48144 et #48143 See merge request gitlab-org/gitlab-ce!20023
2018-06-21[Rails5] Force the `protect_from_forgery` callback run firstblackst0ne
Since Rails 5.0 the `protect_from_forgery` callback doesn't run first by default anymore. [1] Instead it gets inserted into callbacks chain where callbacks get called in order. This commit forces the callback to run first. [1]: https://github.com/rails/rails/commit/39794037817703575c35a75f1961b01b83791191
2018-06-21Update wrong initial setting transfer in application_settings_controller.rbAndrei Vukolov
2018-06-20Merge branch 'rails5-fix-48142' into 'master'Rémy Coutable
Rails5 fix Admin::HooksController Closes #48142 See merge request gitlab-org/gitlab-ce!20017
2018-06-20Merge branch '48100-fix-branch-not-shown' into 'master'Rémy Coutable
Resolve "Set the language setting to something other than English, the branch of Merge Request will not be visible." Closes #48100 See merge request gitlab-org/gitlab-ce!20016
2018-06-20[Rails5] Set request.format in commits_controllerblackst0ne
Since Rails 5.0 `request.format` is being set depending on the route extension. In commits pages we pass a ref as a URL parameter. If the ref is an extension-like, Rails converts it and sets to `request.format`. E.g. if the ref is `some_branch.atom`, Rails starts responding with `atom` format, but it should response with `html` because `.atom` is the part of ref name, not the format. This commit explicitly sets `request.format` to `:html` when needed.
2018-06-20Rails5 fix expected: 0 times with any arguments received: 1 time with ↵Jasper Maes
arguments: DashboardController
2018-06-20Rails5 fix Admin::HooksControllerJasper Maes
2018-06-20The json keys of ref switcher should not be translatedHiroyuki Sato
2018-06-19Merge branch 'zj-counting-commits' into 'master'Douwe Maan
Counting commits is done by Gitaly Closes gitaly#382 See merge request gitlab-org/gitlab-ce!19983
2018-06-19Counting commits is done by GitalyZeger-Jan van de Weg
Closes https://gitlab.com/gitlab-org/gitaly/issues/382
2018-06-19Merge branch 'rails5-fix-46276' into 'master'Rémy Coutable
Rails5 fix format in uploads actions Closes #46276 See merge request gitlab-org/gitlab-ce!19907
2018-06-18Rails5 fix format in uploads actionsJasper Maes
2018-06-18Merge branch '47672-set_inline_content_type_for_ics' into 'master'Douwe Maan
Render calendar feed inline when accessed from GitLab Closes #47672 See merge request gitlab-org/gitlab-ce!19698
2018-06-18Merge branch ↵Rémy Coutable
'blackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404' into 'master' Resolve "[Rails5] expected the response to have status code :ok but it was 404" Closes #48008 See merge request gitlab-org/gitlab-ce!19937
2018-06-18Merge branch 'blackst0ne-rails5-fix-blob-requests-format' into 'master'Rémy Coutable
[Rails5] Explicitly set request.format for blob_controller Closes #47921 See merge request gitlab-org/gitlab-ce!19876
2018-06-18Render calendar feed inline when accessed from GitLabImre Farkas
With text/calendar as Content-Type, the browser always downloads the content as a file (even ignoring the Content-Disposition header). We want to display the content inline when accessed from GitLab, similarly to the RSS feed.
2018-06-18Merge branch '47933-MR-invisible-milestone' into 'master'Douwe Maan
Resolve "Milestone not updating in MR sidebar after selection" Closes #47933 See merge request gitlab-org/gitlab-ce!19870
2018-06-16[Rails5] Set request.format for artifacts_controllerblackst0ne
Since Rails 5 request.format gets set by extension if it's not explicitly set. That means artifacts_controller#file no longer works as expected. This commit explicitly sets request.format for artifacts_controller#file.
2018-06-16Fix milestones disappearing when changed on MRMario de la Ossa
2018-06-15Merge branch 'rails5-fix-47836' into 'master'Yorick Peterse
Rails5 fix passing Group objects array into for_projects_and_groups milestone scope Closes #47836 See merge request gitlab-org/gitlab-ce!19863
2018-06-15Merge branch 'ide-add-last-commit-id-to-api-call' into 'master'Douwe Maan
IDE sends last commit ID when committing changes Closes #46192 See merge request gitlab-org/gitlab-ce!19552
2018-06-15Merge branch 'ce-jej/sanitize-group-saml-relay-state' into 'master'Kamil Trzciński
[CE backport] Backport InternalRedirect#sanitize_redirect See merge request gitlab-org/gitlab-ce!19795
2018-06-15only return last_commit_sha in the JSONPhil Hughes
2018-06-15IDE sends last commit ID when committing changesPhil Hughes
Closes #46192
2018-06-15Reuse viewer param and move logic to blob controllerDouwe Maan
2018-06-15[Rails5] Explicitly set request.format for blob_controllerblackst0ne
In Rails 4.2 if params[:format] is empty, Rails set it to :html But since Rails 5.0 the framework now looks for an extension. E.g. for `blob/master/CHANGELOG.md` in Rails 4 the format would be `:html`, but in Rails 5 on it'd be `:md` This commit explicitly sets the `:html` format for all requests unless `:format` is set by a client e.g. by JS for XHR requests.
2018-06-14Fixed linting error with trailing space in rbTim Zallmann
2018-06-14Makes the html attribute in the json output optional with the option ↵Tim Zallmann
html_render=false
2018-06-14Rails5 fix passing Group objects array into for_projects_and_groups ↵Jasper Maes
milestone scope
2018-06-14Backport InternalRedirect#sanitize_redirectJames Edwards-Jones
2018-06-13Render access denied without messageBob Van Landuyt
The `errors/access_denied` page should not fail to render when no message is provided. When accessing something as a sessionless user, we should also display the terms message if possible.
2018-06-08Users can accept terms during registrationBob Van Landuyt
When a user checks the `accept` checkbox, we will track that acceptance as usual. That way they don't need to accept again after they complete the registration. When an unauthenticated user visits the `/-/users/terms` page, there is no button to accept, decline or continue. The 'current-user menu' is also hidden from the top bar.
2018-06-07Backport of "Add assignee lists to boards"Mario de la Ossa
2018-06-07Merge branch '46648-timeout-searching-group-issues' into 'master'Grzegorz Bizon
Resolve "Timeout searching group issues" Closes #46648 See merge request gitlab-org/gitlab-ce!19429
2018-06-07Merge remote-tracking branch 'origin/master' into ↵Kamil Trzciński
38542-application-control-panel-in-settings-page
2018-06-07Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan
Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-15 00:37:24 +0300