summaryrefslogtreecommitdiff
path: root/app/controllers/projects/issues_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'multi-filter-labels' into 'master' Jacob Schatz2016-04-201-2/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Mutliple label filter Fixes #989 See merge request !3438
| | * | Label text color comes from JSONPhil Hughes2016-04-201-1/+1
| | | | | | | | | | | | | | | | Created issuable singleton to house the filtering
| | * | Filter by multiple labels with little animation.Jacob Schatz2016-04-131-2/+3
| | | |
| * | | Merge branch '14566-confidential-issue-branches' into 'master' Robert Speicher2016-04-191-4/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanitize branch names for confidential issues - When creating new branches for confidential issues, prefer a branch name like `issue-15` to `some-sensitive-issue-title-15`. - The behaviour for non-confidential issues stays the same. Closes #14566 See merge request !3671
| | * | Remove unused variable in `IssuesController`.Timothy Andrew2016-04-181-2/+0
| | | |
| | * | Merge remote-tracking branch 'origin/master' into ↵Timothy Andrew2016-04-151-10/+29
| | |\ \ | | | |/ | | | | | | | | 14566-confidential-issue-branches
| | * | Refactor `Issue#related_branches`Timothy Andrew2016-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Previously, the controller held the logic to calculate related branches, which was: `<branches ending with `issue.iid`> - <branches with a merge request referenced in the current issue>` - This logic belongs in the `related_branches` method, not in the controller. This commit makes this change. - This means that `Issue#related_branches` now needs to take a `User`. When we find the branches that have a merge request referenced in the current issue, this is limited to merge requests that the current user has access to. - This is not directly related to #14566, but is a related refactoring.
* | | | Create table for award emojiZeger-Jan van de Weg2016-05-061-1/+3
|/ / /
* | | Merge branch 'assign-to-issuable-opener' into 'master' Jacob Schatz2016-04-151-2/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issuable can be assigned to author Closes #9014 The only difference with #9014 is that I thoughed the author should also be able to assign the issue. If this is unwanted behavior Ill revert it. /cc @DouweM See merge request !2765
| * | Merge branch 'master' into assign-to-issuable-openerZeger-Jan van de Weg2016-03-291-15/+28
| |\ \ | | |/
| * | Issuable can be assigned to authorZeger-Jan van de Weg2016-02-221-2/+2
| | | | | | | | | | | | | | | | | | | | | Closes #9014 The only difference with #9014 is that I thoughed the author should also be able to assign the issue. If this is unwanted behavior Ill revert it.
* | | Load related MRs/branches asynchronouslyYorick Peterse2016-04-131-10/+30
| |/ |/| | | | | | | | | | | | | | | | | | | | | Currently this works by loading the HAML partials via XHR. While this is not the nicest setup it _is_ the easiest setup using the tools we currently have. Loading this data asynchronously doesn't make loading the related MRs/branches itself faster, it merely ensures that loading the issue itself is not slowed down. Fixes gitlab-org/gitlab-ce#14949
* | Edit button leaves modal openJacob Schatz2016-03-251-1/+1
| | | | | | | | Add user avatar to user selection
* | Remove unnecessary sentenceAlfredo Sumaran2016-03-251-1/+0
| |
* | Adds new dropdown ajax to user selectionJacob Schatz2016-03-251-1/+1
| |
* | Add labels as proper POST arrays using new dropdownJacob Schatz2016-03-251-1/+7
| |
* | Add milestone sidebar update via JSONJacob Schatz2016-03-251-1/+1
| |
* | Ajax call to milestones via new dropdownsJacob Schatz2016-03-251-1/+1
| |
* | Sidebar milestone updatable via JSONJacob Schatz2016-03-251-4/+1
| |
* | Updates sidebar milestone to use new dropdownsJacob Schatz2016-03-251-0/+1
| |
* | Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-211-1/+7
|\ \
| * \ Merge branch 'feature/issue-move' into 'master' Kamil Trzciński2016-03-211-0/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to move issue to another project Tasks: - [x] Create scaffold of service that will move issue to another project. - [x] Close old issue, add system note about moving issue to a new project. - [x] Create a new issue, add system note about issue being moved from old project. - [x] Check if issue can be moved to another project before executing service - [x] Check permissions when moving an issue (`:admin_issue` ability) - [x] Display select box for a new project when editing an issue - [x] Show only projects that issue can be moved into in that select box - [x] Add project select handler, helper and some permission filters to it - [x] Preserve as much information as possible, including author - [x] Prepare mechanisms that unfolds local references in issue description - [x] Rewrite issue description with references unfolding and add some specs for it - [x] Rewrite all system notes and comments attached to issue that is being moved - [x] Update `Label` so that is was able to create cross reference labels (separate MR) - [x] Add notifications about moving issue to another project - [x] Display confirmation alert/message when issue move has been requested - [x] Make it possible to undo selecting project where issue will be moved to - [x] Add column to issue, that will indicate if it has been moved to another project - [x] Do not allow to move issue that has been already moved - [x] Write top-to-bottom feature spec in RSpec instead of Spinach UI: ![issue_move_ui](/uploads/b3c6b563362c1fded9082cc0f51e5a74/issue_move_ui.png) ![issue_move_tooltip](/uploads/2ab913b06f52df1cafde9abe89bd9cb8/issue_move_tooltip.png) Closes #3024 See merge request !2831
| | * | Do not pass params that are not used in issue move serviceGrzegorz Bizon2016-03-201-1/+1
| | | |
| | * | Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-191-2/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (121 commits) Dedupe labels in labels selector in Dashboard pages Refactor colors and lists Add a safeguard in MergeRequest#compute_diverged_commits_count Fix an issue when the target branch of a MR had been deleted Add avatar to issue and MR pages header Cleanup somce css colors Re-group scss variables Refactor `Todo#target` Fixes issue with filter label missing on labels & milestones Rename `Todo#to_reference` to `Todo#target_reference` Fixed failing tests Updated controller with before_action Fixed other issues based on feedback Fixes issue on dashboard issues Full labels data in JSON Fixed issue with labels dropdown getting wrong labels Update CHANGELOG Use `Note#for_project_snippet?` to skip notes on project snippet Use `Commit#short_id` instead of `Commit.truncate_sha` Reuse `for_commit?` on conditional validations Update schema info comment on todo related files ... Conflicts: app/models/issue.rb db/schema.rb spec/models/issue_spec.rb
| | * | | Improvements in issue move feaure (refactoring)Grzegorz Bizon2016-03-191-4/+4
| | | | | | | | | | | | | | | | | | | | According to endbosses' suggestions.
| | * | | Do not pass unsanitized params to issue move serviceGrzegorz Bizon2016-03-171-1/+2
| | | | |
| | * | | Add issue move implementation to controllerGrzegorz Bizon2016-03-171-0/+5
| | | | |
| * | | | Use the configured Kaminari "per page" defaultrs-use-kaminari-defaultRobert Speicher2016-03-191-1/+1
| | |/ / | |/| |
* | | | Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-211-2/+3
| | | |
* | | | Dry destroy action on issuablesZeger-Jan van de Weg2016-03-191-12/+2
| | | |
* | | | Soft delete issuablesZeger-Jan van de Weg2016-03-191-0/+11
|/ / /
* | | Restrict access to confidential issuesDouglas Barbosa Alexandre2016-03-171-1/+5
| | |
* | | Add an option to user make an issue confidentialDouglas Barbosa Alexandre2016-03-171-1/+1
| | |
* | | new-branch-buttonZeger-Jan van de Weg2016-03-151-0/+1
|/ /
* | Move the #toggle_subscription controller method to a concernRémy Coutable2016-03-151-9/+4
| |
* | Improving the original label-subscribing implementationRémy Coutable2016-03-151-0/+2
|/ | | | | | | 1. Make the "subscribed" text in Issuable sidebar reflect the labels subscription status 2. Current user mut be logged-in to toggle issue/MR/label subscription
* Label description and Label rowTap2016-02-171-0/+1
| | | | | - Add label description - Show label row when filtering issues or merge requests by label
* Fix autocomplete for new issues/MRs/snippetsfix-autocomplete-new-issuesYorick Peterse2016-01-151-1/+1
|
* Show referenced MRs & Issues only when the current viewer can access themRémy Coutable2016-01-131-1/+1
|
* Implement new sidebar for merge request pageDmitriy Zaporozhets2015-12-111-1/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statusesGreg Smethells2015-12-111-0/+1
|
* Strip attributes for Milestone and Issuable. #3428Jose Corcuera2015-11-261-3/+1
|
* award emojiValery Sizov2015-11-191-1/+1
|
* Fix trailing space issue with merge requests and issues. Fixes #2514Drew Blessing2015-11-101-1/+3
|
* Redirect to a default path if HTTP_REFERER is not setStan Hu2015-10-201-1/+1
| | | | | | | | | | Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731
* Only accept open issues and merge requestsZeger-Jan van de Weg2015-10-161-1/+1
|
* Show merge requests which close current issueZeger-Jan van de Weg2015-10-161-0/+7
|
* Renamed Note.inc_associations to with_associationsYorick Peterse2015-10-151-1/+1
|
* Eager load various issue/note associationsYorick Peterse2015-10-151-1/+1
| | | | | This ensures we don't end up running N+1 queries for the objects in the affected collections.
* Simplify code around (cross)-referencesDouwe Maan2015-10-121-1/+1
|
View Lorry Controller Status