summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-2128-37/+40
| |\ \ \ \
| | * \ \ \ 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
| | | * \ \ \ Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-202-2/+10
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix bug where wrong commit ID was being used in a merge request diff to show old image Remove CHANGELOG item that was added during merge resolution Improve the "easy WIP & un-WIP from link" feature Fix specs \#to_branch_name now uses the iid as postfix Add label description in tooltip to labels in issue index and sidebar Easily (un)mark merge request as WIP using link Use specialized system notes when MR is (un)marked as WIP another attempt to fix oauth issue attempting to fix omniauth problem Conflicts: app/assets/javascripts/issuable_form.js.coffee
| | | * | | | | 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-199-25/+81
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1928-37/+34
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-214-25/+29
| | | | | | | |
| * | | | | | | Satisfy rubocopZeger-Jan van de Weg2016-03-192-4/+1
| | | | | | | |
| * | | | | | | Dry destroy action on issuablesZeger-Jan van de Weg2016-03-193-13/+28
| | | | | | | |
| * | | | | | | Soft delete issuablesZeger-Jan van de Weg2016-03-191-0/+11
| |/ / / / / /
* | | | | | | Add specs and add visibility level to admin groupsFelipe Artur2016-03-211-1/+1
| | | | | | |
* | | | | | | Fix some specsDouwe Maan2016-03-202-2/+1
| | | | | | |
* | | | | | | Fix "Shared projects" tabDouwe Maan2016-03-201-2/+2
| | | | | | |
* | | | | | | Tweaks, refactoring, and specsDouwe Maan2016-03-2010-110/+101
| | | | | | |
* | | | | | | Merge branch 'master' into issue_12658Douwe Maan2016-03-2012-29/+93
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'remove-wip' into 'master' Jacob Schatz2016-03-191-2/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Easily (un)mark merge request as WIP using link Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3768 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3516 ## Link to add `WIP` prefix (underline is visible because of hover) ![wipless_title](/uploads/72a6f7119ba9d8043ca8329641e97c3b/wipless_title.png) ## Link to remove `WIP` prefix ![wip_title](/uploads/8620ad65da9ef620b180603520fead55/wip_title.png) ## System note after WIP is added ![wip_sysnote](/uploads/2de073b75e854d2c9e243eb8b5d5c259/wip_sysnote.png) ## Widget with link to remove WIP ![wip_widget](/uploads/cf83ea93743c4c26d9df759c17cb9d7b/wip_widget.png) ## Flash after WIP is removed ![wip_flash](/uploads/27b7240cd5d7ceeb8b7b477abd94d7ff/wip_flash.png) ## System note after WIP is removed ![wipless_sysnote](/uploads/c0d3368abdf21a2f253532a9a9594d90/wipless_sysnote.png) ## Widget when current user cannot remove the WIP prefix ![wip_widget_unauthorized](/uploads/174ccf1674be86dc81c3078fe297acb7/wip_widget_unauthorized.png) cc @creamzy See merge request !3006
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-1841-180/+430
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Easily (un)mark merge request as WIP using linkDouwe Maan2016-02-261-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3768
| * | | | | | | Merge branch 'fix/gitlab-omniauth-issue' into 'master' Douwe Maan2016-03-191-0/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attempting to fix omniauth problem Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/3361 See merge request !2876
| | * | | | | | another attempt to fix oauth issueJames Lopez2016-02-191-1/+1
| | | | | | | |
| | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-02-194-7/+15
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/gitlab-omniauth-issue
| | * | | | | | | attempting to fix omniauth problemJames Lopez2016-02-181-0/+1
| | | | | | | | |
| * | | | | | | | Dedupe labels in labels selector in Dashboard pagesfix/14418Rémy Coutable2016-03-181-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also moved useless helper methods and directly to the DashboardController.
| * | | | | | | | Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master' Douwe Maan2016-03-181-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger a todo for mentions on commits page Closes #14006 * Screenshot: ![todo-commit](/uploads/5d34de0b7afcea7548123dafddf60c45/todo-commit.png) See merge request !3262
| | * | | | | | | | Use todo.done without ! in the controller to mark todo as doneDouglas Barbosa Alexandre2016-03-181-2/+2
| | | | | | | | | |
| * | | | | | | | | Fixed failing testsPhil Hughes2016-03-181-1/+1
| | | | | | | | | |
| * | | | | | | | | Updated controller with before_actionPhil Hughes2016-03-182-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed other issues based on feedback
| * | | | | | | | | Fixes issue on dashboard issuesPhil Hughes2016-03-181-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They would try to load JSON from a project even though it isn't a single project
| * | | | | | | | | Full labels data in JSONPhil Hughes2016-03-181-1/+1
| | | | | | | | | |
| * | | | | | | | | Fixed issue with labels dropdown getting wrong labelsPhil Hughes2016-03-182-0/+15
| |/ / / / / / / /
| * | | | | | | | Merge branch 'confidential-issues' into 'master' Douwe Maan2016-03-182-3/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add confidential issues Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3678 More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227 See merge request !3282
| | * | | | | | | | Restrict access for confidential issues on autocompleteDouglas Barbosa Alexandre2016-03-171-1/+1
| | | | | | | | | |
| | * | | | | | | | 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
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'optimistic-todos' into 'master' Jacob Schatz2016-03-181-2/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds small AJAX optimistic functionality to todos. Fixes #13656 <br/> A good first step and boring solution. <br/> Will make ajax call to remove each issue. <br/> If issue is last in group of issues will refresh page. <br/> If issues remain in group will remove row with JS. <br/> Adds loading spinner to button and disables. <br/> ![todos-optimistic](/uploads/c6aec4a688e5125d4df55a2a3a55d4d7/todos-optimistic.gif) <br/> cc @dzaporozhets @JobV @dbalexandre See merge request !2946
| | * | | | | | | Mark all as done through AJAXPhil Hughes2016-03-171-0/+4
| | | | | | | | |
| | * | | | | | | Removed the flash success messagePhil Hughes2016-03-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the group if empty
| | * | | | | | | Adds small AJAX optimistic functionality to todos.Jacob Schatz2016-03-171-1/+6
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13656 A good first step and boring solution.
| * | | | | | | Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-171-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | External Users The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects. Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users) ![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png) See merge request !3171
| * \ \ \ \ \ \ \ Merge branch 'new-branch-button-issue' into 'master' Douwe Maan2016-03-172-3/+19
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New branch button on issues Creates a button which creates a branch for you, referencing the original issue in the branch name. When creating the MR the text `Closes #iid` is appended to the description field. The button; with styling ![Screenshot_from_2016-02-13_17-28-54](/uploads/9595fbfef88c10a499829beaa3db11c1/Screenshot_from_2016-02-13_17-28-54.png) Links to the related branches on the issue ![Screenshot_from_2016-02-13_17-31-48](/uploads/ee7a78754eb5e2389f8671771bb59af9/Screenshot_from_2016-02-13_17-31-48.png) Styled like the MR links ![Screenshot_from_2016-02-13_17-31-53](/uploads/c60130333a650a16f51b014aeb1458c3/Screenshot_from_2016-02-13_17-31-53.png) Please provide input on the following; the CI repo on the GDK had the following happening with the current way I implemented the matching: ![Screenshot_from_2016-02-14_08-57-19](/uploads/35e7a3687a0fa801aba1ad66305ab2ff/Screenshot_from_2016-02-14_08-57-19.png) Closes #3886 cc @DouweM See merge request !2808
| | * \ \ \ \ \ \ \ Merge branch 'master' into new-branch-button-issueZeger-Jan van de Weg2016-03-172-3/+3
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | Incorporate reviewZeger-Jan van de Weg2016-03-151-4/+3
| | | | | | | | | |
| | * | | | | | | | Enhance new branch button on an issueZeger-Jan van de Weg2016-03-151-0/+6
| | | | | | | | | |
| | * | | | | | | | new-branch-buttonZeger-Jan van de Weg2016-03-152-3/+14
| | | | | | | | | |
| * | | | | | | | | Reuse `no_cache_headers` method in badges controllerGrzegorz Bizon2016-03-171-12/+1
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Clearify who deletes the userZeger-Jan van de Weg2016-03-151-1/+1
| | | | | | | | |
| * | | | | | | | Fix broken specsZeger-Jan van de Weg2016-03-151-1/+1
| | | | | | | | |