summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-2117-165/+110
| | | | | | | | | |
| * | | | | | | | | Satisfy rubocopZeger-Jan van de Weg2016-03-192-4/+1
| | | | | | | | | |
| * | | | | | | | | minor improvements and fixed specsZeger-Jan van de Weg2016-03-196-29/+34
| | | | | | | | | |
| * | | | | | | | | Dry destroy action on issuablesZeger-Jan van de Weg2016-03-1915-43/+56
| | | | | | | | | |
| * | | | | | | | | Hide delete botton on edit pageZeger-Jan van de Weg2016-03-196-11/+9
| | | | | | | | | |
| * | | | | | | | | Soft delete issuablesZeger-Jan van de Weg2016-03-1920-18/+254
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix/safe-import-url' into 'master' Douwe Maan2016-03-212-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent tokens in the import URL to be showed by the UI Quick fix to prevent the import URL to show a user's token. See merge request !3331
| * | | | | | | | | updated changelogfix/safe-import-urlJames Lopez2016-03-211-0/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-21658-8791/+13482
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | fix/safe-import-url
* | | | | | | | | | Merge branch 'remove-console-log' into 'master' Jacob Schatz2016-03-211-1/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove console.log call See merge request !3322
| * | | | | | | | | | Remove console.log callStan Hu2016-03-201-1/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'issues-show-performance' into 'master' Robert Speicher2016-03-2113-23/+140
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of viewing individual issues This MR does two things: 1. `Issue#related_branches` no longer performs Git operations that aren't needed 2. The output of `Repository#exists?` is now cached and flushed properly Combined these two changes should further cut down the amount of Git operations performed when viewing individual issues (and possibly other pages). See merge request !3296
| * | | | | | | | | | | Create SSH keys for SSH clone Spinach testsissues-show-performanceYorick Peterse2016-03-212-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests would check if the "This project is empty" banner would contain SSH clone URLs. Oddly enough this should have never passed (as far as I can tell) as SSH clone URLs in this banner are _only_ displayed if the current user has at least 1 SSH key attached. Since the tests never seem to create any they never should have passed, yet somehow they did. To solve this the Spinach tests in question now ensure at least 1 SSH key is present.
| * | | | | | | | | | | Create repositories in Spinach issues testsYorick Peterse2016-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to ad90dba5185e30883d5ad6008c166b0df0108ebf we always have a repository in the real world, so let's also create one in our Spinach tests.
| * | | | | | | | | | | Create repositories in IssuesController specsYorick Peterse2016-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the real world a project always has a repository. This fact allows code such as Issue#related_branches to work without explicitly checking if a repository exists.
| * | | | | | | | | | | Cache output of Repository#exists?Yorick Peterse2016-03-198-15/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caches the output of Repository#exists? in Redis while making sure it's flushed properly when creating new repositories, deleting them, etc. For the ProjectWiki tests to work I had to make ProjectWiki#create_repo! public as testing private methods in RSpec is a bit of a pain.
| * | | | | | | | | | | Tweaked performance of Issue#related_branchesYorick Peterse2016-03-192-5/+5
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requesting the branch names of a repository works even when it's empty, thus there's no need to explicitly check for an empty repository. Removing this check cuts down the amount of Git operations which in turn cuts down request timings a bit. The regular expression used to compare branches was also moved out of the loop so it's created only once.
* | | | | | | | | | | Merge branch 'feature/issue-move' into 'master' Kamil Trzciński2016-03-2130-15/+866
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 rewrite reference if already a cross referenceGrzegorz Bizon2016-03-211-2/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Change icon and cursor for issue move field tooltipfeature/issue-moveGrzegorz Bizon2016-03-201-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Preserve created at time of notes when moving issueGrzegorz Bizon2016-03-202-1/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-2023-57/+158
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | | | | | | Find referable for each ref found in references rewriterGrzegorz Bizon2016-03-202-10/+19
| | | | | | | | | | | | |
| * | | | | | | | | | | | Rename reference unfolder to rewriter, minor refactoringsGrzegorz Bizon2016-03-203-21/+21
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add tooltip info about issue move filed purposeGrzegorz Bizon2016-03-201-0/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Do not pass params that are not used in issue move serviceGrzegorz Bizon2016-03-202-3/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add Changelog entry for issue move featureGrzegorz Bizon2016-03-191-0/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Update reference unfolder according to recent ability changesGrzegorz Bizon2016-03-194-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 43d8bdb4f048cbeb5675ed9120cb1aeb415b9586 introduced additional checks for permissions to read issue in references extractor.
| * | | | | | | | | | | | Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-19193-1013/+3052
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1911-142/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to endbosses' suggestions.
| * | | | | | | | | | | | Do not use javascript in specs for issue moveGrzegorz Bizon2016-03-171-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature specs that were using javascript took a long time to finish (about 10x longer) and where hitting Poltergeist timeouts. This modification skips using javascript with select2 selecbox, thus it is faster, but this also does not check some JavaScript related features.
| * | | | | | | | | | | | Prevent issue move if issue has been already movedGrzegorz Bizon2016-03-176-3/+99
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add field that references issue this issue has been moved toGrzegorz Bizon2016-03-173-1/+11
| | | | | | | | | | | | |
| * | | | | | | | | | | | Update methods that use issue close serviceGrzegorz Bizon2016-03-173-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Issues::CloseService#execute` signature has changed, because of using keyword parameter for commmit.
| * | | | | | | | | | | | Add feature specs for issue moveGrzegorz Bizon2016-03-172-1/+78
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add minor improvements in code related to issue moveGrzegorz Bizon2016-03-177-38/+50
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use helper to create list of projects issue can be moved toGrzegorz Bizon2016-03-174-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also adds confirmation message if issue move has been requested.
| * | | | | | | | | | | | Revert changes in js used to create project selectGrzegorz Bizon2016-03-171-50/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will preserve those changes in history, we may need them in future. Currently we will use a issues helpers to create options to choose project whem moving issue to it.
| * | | | | | | | | | | | Add new notifications for issue move actionGrzegorz Bizon2016-03-177-3/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | Reuse existing issue services when moving issueGrzegorz Bizon2016-03-175-52/+26
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add initial notifications and hooks for issue moveGrzegorz Bizon2016-03-173-13/+38
| | | | | | | | | | | | |
| * | | | | | | | | | | | Make it possible to exclude project in projects selectGrzegorz Bizon2016-03-172-9/+24
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add access-level filter support for projects selectGrzegorz Bizon2016-03-174-22/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also refactores ProjectSelect adding some decorator-like functions.
| * | | | | | | | | | | | Make it possible to move issue if user is a reporterGrzegorz Bizon2016-03-174-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussed it here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2831#note_4190228
| * | | | | | | | | | | | Preserve original author when moving issueGrzegorz Bizon2016-03-172-25/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also wrapps entire process into transation, as rewriting references may have large memory footprint.
| * | | | | | | | | | | | Add implementation of reference unfolder using banzaiGrzegorz Bizon2016-03-173-8/+78
| | | | | | | | | | | | |
| * | | | | | | | | | | | Move reference unfolder for GFM to separate classGrzegorz Bizon2016-03-178-131/+95
| | | | | | | | | | | | |
| * | | | | | | | | | | | Do not unfold non-referables when moving an issueGrzegorz Bizon2016-03-171-0/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use internal reference extractor in banzai unfold pipelineGrzegorz Bizon2016-03-174-65/+66
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add reference unfold pipeline used when moving issueGrzegorz Bizon2016-03-175-6/+123
| | | | | | | | | | | | |