Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into refactor-realtime-issue | Phil Hughes | 2017-05-11 | 1 | -2/+2 |
|\ | |||||
| * | Enable the Style/TrailingCommaInArguments cop | Rémy Coutable | 2017-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Enable the Style/TrailingCommaInLiteral cop | Rémy Coutable | 2017-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Fixed tests on textarea looking for innerText instead of value | Phil Hughes | 2017-05-10 | 1 | -1/+0 |
|/ | |||||
* | Remove redirect for old issue url containing id instead of iid | blackst0ne | 2017-05-10 | 1 | -16/+1 |
| | |||||
* | Merge branch 'mia_backort' into 'master' | Jacob Schatz | 2017-05-05 | 1 | -3/+3 |
|\ | | | | | | | | | Backport of Multiple Assignees feature See merge request !11089 | ||||
| * | Backport of multiple_assignees_feature [ci skip] | Valery Sizov | 2017-05-04 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'issue-title-description-realtime' into 'master' | Phil Hughes | 2017-05-05 | 1 | -1/+10 |
|\ \ | |/ |/| | | | | | | | | | Render Description Realtime :tada: Closes #25049 and #31355 See merge request !10865 | ||||
| * | remove curr and previous states - extract tasks logic to tasks action | Regis | 2017-05-02 | 1 | -0/+1 |
| | | |||||
| * | make tab title legit | Regis | 2017-05-01 | 1 | -0/+2 |
| | | |||||
| * | update task_list n/n | Regis | 2017-04-26 | 1 | -0/+2 |
| | | |||||
| * | render description - tasks work - gfm is juicy | Regis | 2017-04-21 | 1 | -1/+5 |
| | | |||||
* | | Allow to create new branch and empty WIP merge request from issue page | Alfredo Sumaran | 2017-05-04 | 1 | -2/+19 |
|/ | |||||
* | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-06 | 1 | -3/+8 |
|\ | |||||
| * | Merge remote-tracking branch 'dev/master' | DJ Mountney | 2017-04-05 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'open-redirect-host-fix' into 'security' | Sean McGivern | 2017-04-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Fix for three open redirect vulns using redirect_to url_for(params.merge))) See merge request !2082 | ||||
| * | | Issue title realtime | Regis Boudinot | 2017-04-06 | 1 | -2/+7 |
| |/ | |||||
* | | Address review comments | Douwe Maan | 2017-04-05 | 1 | -1/+1 |
| | | |||||
* | | Add option to start a new discussion on an MR | Douwe Maan | 2017-04-05 | 1 | -7/+3 |
|/ | |||||
* | Display flash message to unauthenticated user when creating new issue | Sam Rose | 2017-03-25 | 1 | -0/+9 |
| | |||||
* | Present ajax call errors when failing to update an Issue | Oswaldo Ferreira | 2017-03-21 | 1 | -1/+8 |
| | |||||
* | Merge remote-tracking branch 'dev/master' | DJ Mountney | 2017-03-20 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'render-json-leak' into 'security' | DJ Mountney | 2017-03-20 | 1 | -1/+1 |
| | | | | | | | | | | fix for render json include leaks See merge request !2074 | ||||
* | | Merge branch ↵ | Sean McGivern | 2017-03-20 | 1 | -0/+2 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | '20204-new-issue-button-redirects-you-to-create-a-new-issue-after-logging-in' into 'master' Redirect to signin when New Issue for not logged in Closes #20204 See merge request !9743 | ||||
| * | Redirect to signin when New Issue for not logged in | Sam Rose | 2017-03-20 | 1 | -0/+2 |
| | | |||||
* | | Check `service.discussion_to_resolve_id` to decide content of flash | Bob Van Landuyt | 2017-03-13 | 1 | -1/+1 |
| | | | | | | | | That way the check is the same in the service & the controller | ||||
* | | Rename variable | Bob Van Landuyt | 2017-03-13 | 1 | -4/+3 |
| | | | | | | | | | | merge_request_for_resolving_discussions -> merge_request_to_resolve_discussions_of | ||||
* | | Separate flash messages for resolving one or multiple discussions | Bob Van Landuyt | 2017-03-13 | 1 | -3/+6 |
| | | |||||
* | | Add a flash messages when an issue resolving discussions is created | Bob Van Landuyt | 2017-03-13 | 1 | -1/+7 |
| | | |||||
* | | Move functionality for resolving discussions into a concern | Bob Van Landuyt | 2017-03-13 | 1 | -3/+2 |
| | | |||||
* | | Always require MR-iid for resolving discussions | Bob Van Landuyt | 2017-03-13 | 1 | -24/+12 |
| | | | | | | | | | | And deduplicate the finding of MR's & discussions. Now the searching is done in the service, istead of the controller & the API. | ||||
* | | Delegate a single discussion to a new issue | Bob Van Landuyt | 2017-03-13 | 1 | -5/+19 |
|/ | | | | | | Delegate a discussion in a merge request into a new issue. The discussion wil be marked as resolved and a system note will be added linking to the newly created issue. | ||||
* | Fix issuable stale object error handler for js when updating tasklistsissue_24815 | Felipe Artur | 2017-02-24 | 1 | -2/+1 |
| | |||||
* | Merge branch 'add_mr_info_to_issues_list' into 'master' | Sean McGivern | 2017-02-22 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Add merge request count to each issue on issues list Closes #19786 and #23208 See merge request !9252 | ||||
| * | Add merge request count to each issue on issues list | blackst0ne | 2017-02-17 | 1 | -1/+1 |
| | | |||||
* | | Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-edit | Oswaldo Ferreira | 2017-02-21 | 1 | -25/+9 |
|/ | |||||
* | Gather issuable metadata to avoid n+ queries on index viewissue_25900_2 | Felipe Artur | 2017-02-09 | 1 | -2/+5 |
| | |||||
* | Use reCaptcha when an issue identified as spam | Jarka Kadlecova | 2017-02-07 | 1 | -5/+17 |
| | |||||
* | pass username and id associations needed in the frontend26955-handle-legacy-issue-filter-params | Mike Greiling | 2017-01-20 | 1 | -18/+12 |
| | |||||
* | automatically redirect urls containing author_id or assignee_id | Mike Greiling | 2017-01-20 | 1 | -0/+18 |
| | |||||
* | applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-empty | Tiago Botelho | 2016-12-23 | 1 | -1/+1 |
| | |||||
* | adds specs for respective behaviour | Tiago Botelho | 2016-12-21 | 1 | -2/+4 |
| | |||||
* | Prevent empty pagination when list is not empty | Tiago Botelho | 2016-12-21 | 1 | -1/+2 |
| | |||||
* | Feature: delegate all open discussions to Issue | Bob Van Landuyt | 2016-12-05 | 1 | -2/+13 |
| | | | | | | | | | | | | | When a merge request can only be merged when all discussions are resolved. This feature allows to easily delegate those discussions to a new issue, while marking them as resolved in the merge request. The user is presented with a new issue, prepared with mentions of all unresolved discussions, including the first unresolved note of the discussion, time and link to the note. When the issue is created, the discussions in the merge request will get a system note directing the user to the newly created issue. | ||||
* | Backport some changes done from Time Tracking feature in EE.ee-870-backport | Ruben Davila | 2016-11-18 | 1 | -1/+1 |
| | |||||
* | add "x of y tasks completed" on issuable | Guilherme Salazar | 2016-10-28 | 1 | -1/+1 |
| | | | | | | fix issues pointed out in !6527 add task completion status feature to CHANGELOG | ||||
* | Use present? instead of presence on Projects::IssuesController#index | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -1/+1 |
| | |||||
* | Remove project_labels from Projects::ApplicationController | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -5/+1 |
| | |||||
* | List group labels on project labels page | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -2/+2 |
| | |||||
* | Allow user to create a board list based on a group label | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -1/+4 |
| |