Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Create and use project path helpers that only need a project, no namespace | Douwe Maan | 2017-07-05 | 1 | -0/+4 |
| | |||||
* | Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643 | Douwe Maan | 2017-07-04 | 1 | -1/+1 |
| | | | This reverts merge request !12557 | ||||
* | Backport changes to Projects::IssuesController and the search bar | Nick Thomas | 2017-06-29 | 1 | -4/+16 |
| | |||||
* | Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'" | Adam Niedzielski | 2017-06-29 | 1 | -1/+1 |
| | | | | | This reverts commit b07c00032b038f40796a28e34b6dd4c622bad012, reversing changes made to 2b97d76d0b08a778710410df910a7601f6b8e9e7. | ||||
* | Drop default ORDER scope when calling a find method on a Sortable model | Douwe Maan | 2017-06-28 | 1 | -1/+1 |
| | |||||
* | Use the new check_project_feature_available! method in project controllers | Nick Thomas | 2017-06-21 | 1 | -2/+2 |
| | |||||
* | Merge branch 'tidy-up-issues-controller-filters' into 'master' | Douwe Maan | 2017-06-13 | 1 | -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-filters | Sean McGivern | 2017-06-13 | 1 | -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 layout | Tieu-Philippe KHIM | 2017-06-12 | 1 | -1/+1 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into ↵ | Luke "Jared" Bennett | 2017-06-02 | 1 | -4/+1 |
|\ | | | | | | | fix-realtime-edited-text-for-issues-9-3 | ||||
| * | Merge branch 'master' into issue-edit-inline | Phil Hughes | 2017-05-25 | 1 | -1/+4 |
| |\ | |||||
| * | | Added move to project in issue inline edit form | Phil Hughes | 2017-05-17 | 1 | -4/+1 |
| | | | | | | | | | | | | [ci skip] | ||||
* | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master. | Luke "Jared" Bennett | 2017-05-31 | 1 | -3/+10 |
| |/ |/| | |||||
* | | Bugfix: don't redirect to JSON endpoints after sign in | Ruben Davila | 2017-05-19 | 1 | -1/+4 |
|/ | |||||
* | Rename all references to rendered_title to realtime_changesrename-rendered_title | Luke "Jared" Bennett | 2017-05-13 | 1 | -3/+3 |
| | |||||
* | 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 |
| | |