diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-06-07 05:56:41 +0000 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-06-07 05:56:41 +0000 |
| commit | a97f4ec3615595694b11676484e9ac1ba5524a9e (patch) | |
| tree | c82ad96af00a0cdd898f26a8e1da5a9bdae14819 /app/services/base_service.rb | |
| parent | 119b128ec8415a074a73b73a7878717779c6e0f3 (diff) | |
| parent | 760b12dc6b3a927c918855e2ee85a1c0e6bddb73 (diff) | |
| download | gitlab-ce-a97f4ec3615595694b11676484e9ac1ba5524a9e.tar.gz | |
Merge branch 'master' into '39549-label-list-page-redesign-with-draggable-labels'
# Conflicts:
# app/views/projects/labels/index.html.haml
Diffstat (limited to 'app/services/base_service.rb')
| -rw-r--r-- | app/services/base_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/base_service.rb b/app/services/base_service.rb index 6883ba36c71..3519b7c5e7d 100644 --- a/app/services/base_service.rb +++ b/app/services/base_service.rb @@ -3,7 +3,7 @@ class BaseService attr_accessor :project, :current_user, :params - def initialize(project, user, params = {}) + def initialize(project, user = nil, params = {}) @project, @current_user, @params = project, user, params.dup end |