diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-06 14:36:44 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-07 09:15:46 +0100 |
| commit | 18607d6c88e820b927d90ca1d247a23a61be8c99 (patch) | |
| tree | 9dafa4bc290cd56d66d2dc9f3ce044ddf769e58f /app | |
| parent | e6fa8a3d10fe34e9ee17f3122139f0b8b1b0a3f9 (diff) | |
| download | gitlab-ce-18607d6c88e820b927d90ca1d247a23a61be8c99.tar.gz | |
Added tests
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/boards/filters/due_date_filters.js.es6 | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/users_select.js | 2 | ||||
| -rw-r--r-- | app/views/projects/boards/components/sidebar/_assignee.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/boards/filters/due_date_filters.js.es6 b/app/assets/javascripts/boards/filters/due_date_filters.js.es6 index 5c1519986c1..50ef1911022 100644 --- a/app/assets/javascripts/boards/filters/due_date_filters.js.es6 +++ b/app/assets/javascripts/boards/filters/due_date_filters.js.es6 @@ -1,4 +1,4 @@ Vue.filter('due-date', (value) => { - const date = new Date(value.replace(new RegExp('-', 'g'), ',')); + const date = new Date(value); return $.datepicker.formatDate('M d, yy', date); }); diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index 67a71f6c381..82c75c614b1 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -48,7 +48,7 @@ $block.on('click', '.js-assign-yourself', function(e) { e.preventDefault(); - if ($dropdown.hasClass('js-issue-board-assignee')) { + if ($dropdown.hasClass('js-issue-board-sidebar')) { Vue.set(gl.issueBoards.BoardsStore.detail.issue, 'assignee', new ListUser({ id: _this.currentUser.id, username: _this.currentUser.username, diff --git a/app/views/projects/boards/components/sidebar/_assignee.html.haml b/app/views/projects/boards/components/sidebar/_assignee.html.haml index 92f2a931668..4307e8e7626 100644 --- a/app/views/projects/boards/components/sidebar/_assignee.html.haml +++ b/app/views/projects/boards/components/sidebar/_assignee.html.haml @@ -28,7 +28,7 @@ ":value" => "issue.assignee.id", "v-if" => "issue.assignee" } .dropdown - %button.dropdown-menu-toggle.js-user-search.js-author-search.js-issue-board-sidebar{ data: { toggle: "dropdown", field_name: "issue[assignee_id]", first_user: (current_user.username if current_user), current_user: "true", project_id: @project.id, field_name: "issue[assignee_id]", null_user: "true" }, + %button.dropdown-menu-toggle.js-user-search.js-author-search.js-issue-board-sidebar{ data: { toggle: "dropdown", field_name: "issue[assignee_id]", first_user: (current_user.username if current_user), current_user: "true", project_id: @project.id, null_user: "true" }, ":data-issuable-id" => "issue.id", ":data-issue-update" => "'#{namespace_project_issues_path(@project.namespace, @project)}/' + issue.id + '.json'" } Select assignee |