summaryrefslogtreecommitdiff
path: root/app/controllers/projects/issues_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-051-0/+4
|
* Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643Douwe Maan2017-07-041-1/+1
| | | This reverts merge request !12557
* Backport changes to Projects::IssuesController and the search barNick Thomas2017-06-291-4/+16
|
* Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"Adam Niedzielski2017-06-291-1/+1
| | | | | This reverts commit b07c00032b038f40796a28e34b6dd4c622bad012, reversing changes made to 2b97d76d0b08a778710410df910a7601f6b8e9e7.
* Drop default ORDER scope when calling a find method on a Sortable modelDouwe Maan2017-06-281-1/+1
|
* Use the new check_project_feature_available! method in project controllersNick Thomas2017-06-211-2/+2
|
* Merge branch 'tidy-up-issues-controller-filters' into 'master'Douwe Maan2017-06-131-9/+6
|\ | | | | | | | | Always check read_issue permissions when loading issue See merge request !12095
| * Always check read_issue permissions when loading issuetidy-up-issues-controller-filtersSean McGivern2017-06-131-9/+6
| | | | | | | | We never want to skip the check, so that some actions did so was a mistake.
* | Refactor atom builder by using xml.atom layoutTieu-Philippe KHIM2017-06-121-1/+1
|/
* Merge remote-tracking branch 'origin/master' into ↵Luke "Jared" Bennett2017-06-021-4/+1
|\ | | | | | | fix-realtime-edited-text-for-issues-9-3
| * Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-251-1/+4
| |\
| * | Added move to project in issue inline edit formPhil Hughes2017-05-171-4/+1
| | | | | | | | | | | | [ci skip]
* | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-311-3/+10
| |/ |/|
* | Bugfix: don't redirect to JSON endpoints after sign inRuben Davila2017-05-191-1/+4
|/
* Rename all references to rendered_title to realtime_changesrename-rendered_titleLuke "Jared" Bennett2017-05-131-3/+3
|
* Merge branch 'master' into refactor-realtime-issuePhil Hughes2017-05-111-2/+2
|\
| * Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-101-1/+1
| | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-101-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 valuePhil Hughes2017-05-101-1/+0
|/
* Remove redirect for old issue url containing id instead of iidblackst0ne2017-05-101-16/+1
|
* Merge branch 'mia_backort' into 'master' Jacob Schatz2017-05-051-3/+3
|\ | | | | | | | | Backport of Multiple Assignees feature See merge request !11089
| * Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-041-3/+3
| |
* | Merge branch 'issue-title-description-realtime' into 'master' Phil Hughes2017-05-051-1/+10
|\ \ | |/ |/| | | | | | | | | Render Description Realtime :tada: Closes #25049 and #31355 See merge request !10865
| * remove curr and previous states - extract tasks logic to tasks actionRegis2017-05-021-0/+1
| |
| * make tab title legitRegis2017-05-011-0/+2
| |
| * update task_list n/nRegis2017-04-261-0/+2
| |
| * render description - tasks work - gfm is juicyRegis2017-04-211-1/+5
| |
* | Allow to create new branch and empty WIP merge request from issue pageAlfredo Sumaran2017-05-041-2/+19
|/
* Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-061-3/+8
|\
| * Merge remote-tracking branch 'dev/master'DJ Mountney2017-04-051-1/+1
| |\
| | * Merge branch 'open-redirect-host-fix' into 'security' Sean McGivern2017-04-051-1/+1
| | | | | | | | | | | | | | | Fix for three open redirect vulns using redirect_to url_for(params.merge))) See merge request !2082
| * | Issue title realtimeRegis Boudinot2017-04-061-2/+7
| |/
* | Address review commentsDouwe Maan2017-04-051-1/+1
| |
* | Add option to start a new discussion on an MRDouwe Maan2017-04-051-7/+3
|/
* Display flash message to unauthenticated user when creating new issueSam Rose2017-03-251-0/+9
|
* Present ajax call errors when failing to update an IssueOswaldo Ferreira2017-03-211-1/+8
|
* Merge remote-tracking branch 'dev/master'DJ Mountney2017-03-201-1/+1
|\
| * Merge branch 'render-json-leak' into 'security' DJ Mountney2017-03-201-1/+1
| | | | | | | | | | fix for render json include leaks See merge request !2074
* | Merge branch ↵Sean McGivern2017-03-201-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 inSam Rose2017-03-201-0/+2
| |
* | Check `service.discussion_to_resolve_id` to decide content of flashBob Van Landuyt2017-03-131-1/+1
| | | | | | | | That way the check is the same in the service & the controller
* | Rename variableBob Van Landuyt2017-03-131-4/+3
| | | | | | | | | | merge_request_for_resolving_discussions -> merge_request_to_resolve_discussions_of
* | Separate flash messages for resolving one or multiple discussionsBob Van Landuyt2017-03-131-3/+6
| |
* | Add a flash messages when an issue resolving discussions is createdBob Van Landuyt2017-03-131-1/+7
| |
* | Move functionality for resolving discussions into a concernBob Van Landuyt2017-03-131-3/+2
| |
* | Always require MR-iid for resolving discussionsBob Van Landuyt2017-03-131-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 issueBob Van Landuyt2017-03-131-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_24815Felipe Artur2017-02-241-2/+1
|
* Merge branch 'add_mr_info_to_issues_list' into 'master'Sean McGivern2017-02-221-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 listblackst0ne2017-02-171-1/+1
| |