diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-08-11 15:10:23 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-08-18 23:46:23 +0100 |
| commit | 2f8fada6c06d7ed67307119bf22e9743429c18be (patch) | |
| tree | eb3de7c38e60cf95998e35a6b37945e2567aacab /spec/javascripts | |
| parent | 3e1e9b670fdb12159e31664c3757df6696db90e1 (diff) | |
| download | gitlab-ce-2f8fada6c06d7ed67307119bf22e9743429c18be.tar.gz | |
Fixed conflicts
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/gl_dropdown_spec.js.es6 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/gl_dropdown_spec.js.es6 b/spec/javascripts/gl_dropdown_spec.js.es6 index 4ed194f5179..b529ea6458d 100644 --- a/spec/javascripts/gl_dropdown_spec.js.es6 +++ b/spec/javascripts/gl_dropdown_spec.js.es6 @@ -45,10 +45,10 @@ selectable: true, data: this.projectsData, text: (project) => { - (project.name_with_namespace || project.name) + (project.name_with_namespace || project.name); }, id: (project) => { - project.id + project.id; } }); }); |