summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | 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
| | | | | | | | | | | |
| * | | | | | | | | | | Minor refactoring of issue move service and specsGrzegorz Bizon2016-03-172-17/+20
| | | | | | | | | | | |
| * | | | | | | | | | | Rewrite references in notes when moving issueGrzegorz Bizon2016-03-172-17/+49
| | | | | | | | | | | |
| * | | | | | | | | | | Take care about data being rewritten when moving issueGrzegorz Bizon2016-03-172-4/+20
| | | | | | | | | | | |
| * | | | | | | | | | | Use a new issue create service when moving an issueGrzegorz Bizon2016-03-172-5/+29
| | | | | | | | | | | |
| * | | | | | | | | | | Do not pass unsanitized params to issue move serviceGrzegorz Bizon2016-03-173-9/+11
| | | | | | | | | | | |
| * | | | | | | | | | | Rewrite references in issue description when moving itGrzegorz Bizon2016-03-172-7/+35
| | | | | | | | | | | |
| * | | | | | | | | | | Silently close old issue when it has been movedGrzegorz Bizon2016-03-172-7/+14
| | | | | | | | | | | |
| * | | | | | | | | | | Do not show issue move form unless user can moveGrzegorz Bizon2016-03-172-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Add issue move ability and use it in move serviceGrzegorz Bizon2016-03-173-17/+65
| | | | | | | | | | | |
| * | | | | | | | | | | Add implementation that rewrites issue notes when movingGrzegorz Bizon2016-03-172-19/+71
| | | | | | | | | | | |
| * | | | | | | | | | | Add issue move implementation to controllerGrzegorz Bizon2016-03-174-15/+59
| | | | | | | | | | | |
| * | | | | | | | | | | Add ability to choose id attribute in project select helperGrzegorz Bizon2016-03-172-3/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Add mock-up for interface being used to move issueGrzegorz Bizon2016-03-171-0/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Improve system notes that are added when issue is movedGrzegorz Bizon2016-03-174-20/+66
| | | | | | | | | | | |
| * | | | | | | | | | | Add new system note used when issue has been movedGrzegorz Bizon2016-03-174-0/+42
| | | | | | | | | | | |
| * | | | | | | | | | | Add scaffold of service that moves issue to another projectGrzegorz Bizon2016-03-172-0/+63
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'workhorse-0.7.1' into 'master' Rémy Coutable2016-03-213-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-workhorse 0.7.1 A small extra defense against interrupted git raw responses. Nice to have in 8.6 because we introduce /raw/ caching; it would be unfortunate if incorrect (truncated) responses got cached. See merge request !3330
| * | | | | | | | | | | | Gitlab-workhorse tags have "v" nowworkhorse-0.7.1Jacob Vosmaer2016-03-212-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use gitlab-workhorse 0.7.1Jacob Vosmaer2016-03-213-3/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix-image-mode-view-diff' into 'master' Dmitriy Zaporozhets2016-03-212-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix diff image view modes (2-up, swipe, onion skin) not working Example test case: https://gitlab.com/mrtzcspr/test/commit/5d983226b1308d98ef3d8919b978ad49f34496b8 Closes #13856 See merge request !3316
| * | | | | | | | | | | | | Fix diff image view modes (2-up, swipe, onion skin) not workingStan Hu2016-03-192-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13856
* | | | | | | | | | | | | | Merge branch 'rs-use-kaminari-default' into 'master' Dmitriy Zaporozhets2016-03-2128-37/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the configured Kaminari "per page" default Configured in [`config/initializers/kaminari.rb`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/initializers/kaminari_config.rb). See merge request !3320
View Lorry Controller Status