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
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 03:09:24 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 03:09:24 +0300
commit2711c26beaca6c3a5a3be4b65e01557faf0185b6 (patch)
tree25d0c2ddb47e87712044884f558a9104c686805f /app/controllers/projects
parent8a7aaf86831d2a556578ae558a4fcab8bb659b20 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/logs_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/logs_controller.rb b/app/controllers/projects/logs_controller.rb
index d598171e92c..ba509235417 100644
--- a/app/controllers/projects/logs_controller.rb
+++ b/app/controllers/projects/logs_controller.rb
@@ -48,7 +48,7 @@ module Projects
end
def elasticsearch_params
- params.permit(:container_name, :pod_name, :search, :start, :end, :cursor)
+ params.permit(:container_name, :pod_name, :search, :start_time, :end_time, :cursor)
end
def environment