summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* first round of fixes and spec fixesJames Lopez2016-03-221-4/+4
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-2243-556/+1038
|\ | | | | | | fix/project-import_url
| * Fix specsissue_12658Douwe Maan2016-03-221-10/+11
| |
| * Address feedbackDouwe Maan2016-03-228-59/+65
| |
| * Merge branch 'master' into issue_12658Douwe Maan2016-03-2119-30/+781
| |\ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
| | * Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master' Jacob Schatz2016-03-212-4/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | change the css class has_tooltip to has-tooltip universally closes #14432 See merge request !3321
| | | * change the css class has_tooltip to has-tooltip universallychange_css_class_has_tooltip_to_has-tooltipArinde Eniola2016-03-202-4/+4
| | | |
| | * | Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-2113-8/+660
| | |\ \
| | * | | Fix typos and dentingZeger-Jan van de Weg2016-03-212-9/+9
| | | | |
| | * | | Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-214-41/+56
| | | | |
| | * | | minor improvements and fixed specsZeger-Jan van de Weg2016-03-193-23/+29
| | | | |
| | * | | Dry destroy action on issuablesZeger-Jan van de Weg2016-03-191-4/+4
| | | | |
| | * | | Soft delete issuablesZeger-Jan van de Weg2016-03-196-6/+84
| | | | |
| * | | | Add specs and add visibility level to admin groupsFelipe Artur2016-03-211-0/+89
| | | | |
| * | | | Fix specsDouwe Maan2016-03-212-2/+2
| | | | |
| * | | | Fix specDouwe Maan2016-03-211-1/+1
| | | | |
| * | | | Fix specsDouwe Maan2016-03-203-15/+10
| | | | |
| * | | | Fix more specsDouwe Maan2016-03-207-33/+31
| | | | |
| * | | | Fix some specsDouwe Maan2016-03-204-48/+8
| | | | |
| * | | | Tweaks, refactoring, and specsDouwe Maan2016-03-2014-745/+476
| | | | |
| * | | | Merge branch 'master' into issue_12658Douwe Maan2016-03-2039-112/+1328
| |\ \ \ \ | | |/ / /
| * | | | Fix specsFelipe Artur2016-03-188-11/+13
| | | | |
| * | | | Improve group visibility level featureZeger-Jan van de Weg2016-03-188-57/+54
| | | | |
| * | | | Code fixesFelipe Artur2016-03-178-24/+96
| | | | |
| * | | | Merge 4009-external-users into issue_12658Felipe Artur2016-03-1668-664/+1519
| |\ \ \ \
| * | | | | Code improvements and add Create group serviceFelipe Artur2016-03-162-2/+22
| | | | | |
| * | | | | Add security specsFelipe Artur2016-03-105-40/+329
| | | | | |
| * | | | | Prevent projects to have higher visibility than groupsFelipe Artur2016-03-104-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent Groups to have smaller visibility than projects Add default_group_visibility_level to configuration Code improvements
| * | | | | Add visibility level icon and a couple of specsFelipe Artur2016-03-101-0/+38
| | | | | |
| * | | | | Add permission level to groupsFelipe Artur2016-03-104-0/+66
| | | | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-2112-8/+641
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/project-import_url # Conflicts: # db/schema.rb
| * | | | | Merge branch 'issues-show-performance' into 'master' Robert Speicher2016-03-216-8/+102
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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-194-4/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-191-2/+2
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-217-0/+539
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | Preserve created at time of notes when moving issueGrzegorz Bizon2016-03-201-0/+5
| | | | | |
| | * | | | Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-204-24/+24
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-201-0/+15
| | | | | |
| | * | | | Rename reference unfolder to rewriter, minor refactoringsGrzegorz Bizon2016-03-201-3/+3
| | | | | |
| | * | | | Do not pass params that are not used in issue move serviceGrzegorz Bizon2016-03-201-2/+1
| | | | | |
| | * | | | Update reference unfolder according to recent ability changesGrzegorz Bizon2016-03-192-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 43d8bdb4f048cbeb5675ed9120cb1aeb415b9586 introduced additional checks for permissions to read issue in references extractor.
| | * | | | Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-1936-112/+1352
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-192-53/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-173-0/+79
| | | | | | |
| | * | | | | Add feature specs for issue moveGrzegorz Bizon2016-03-171-0/+77
| | | | | | |
| | * | | | | Add minor improvements in code related to issue moveGrzegorz Bizon2016-03-171-1/+1
| | | | | | |
| | * | | | | Use helper to create list of projects issue can be moved toGrzegorz Bizon2016-03-171-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This also adds confirmation message if issue move has been requested.
| | * | | | | Add new notifications for issue move actionGrzegorz Bizon2016-03-172-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]