Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
AgeCommit message (Collapse)Author
2016-03-21Merge branch 'issues-show-performance' into 'master' Robert Speicher
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
2016-03-21Merge branch 'feature/issue-move' into 'master' Kamil Trzciński
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
2016-03-21Merge branch 'no-gc-retry' into 'master' Robert Speicher
Do not retry "git gc" To prevent 'git gc' timing out on a large repo and then bouncing around in the retry queue. See merge request !3266
2016-03-21Merge branch 'remove-wip' into 'master' Jacob Schatz
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
2016-03-21Merge branch 'issue-branch-iid-postfix' into 'master' Douwe Maan
#to_branch_name now uses the iid as postfix Given the branch name 'mep-mep' with an iid being 1, the current way, master's way, would yield a branch name of 1-mep-mep. The problem for larger projects however would be that a developer might forget what iid the issue was. When this developer would try to tab complete it would: - Or result in 20+ branches possibly - Or start with the wrong digit, try again with digit++ - Would see 20 branches, repeat Thus the obvious way of solving this is letting the dev tab complete on the issue title, which is easier to remember. @DouweM Should this be labelled `pick-in-master`? See merge request !3308
2016-03-21Merge branch 'label-tooltip' into 'master' Douwe Maan
Add label description in tooltip to labels in issue index and sidebar The tooltip can get quite big, but it’s so useful to inform people about what these labels mean new ![Screen_Shot_2016-03-08_at_11.48.28](/uploads/894baaaa1f789c3a2069a924d541e64b/Screen_Shot_2016-03-08_at_11.48.28.png) ![Screen_Shot_2016-03-08_at_11.48.20](/uploads/efe4fa0960054c4071b8f6bf83024403/Screen_Shot_2016-03-08_at_11.48.20.png) @JobV writes on Slack: > yeah I think it’s better than not, but I’d have to try it :smiley: > > cautious yes, revert if it’s annoying :wink: See merge request !3124
2016-03-18Merge branch 'trigger-todo-for-mentions-on-commits-page' into 'master' Douwe Maan
Trigger a todo for mentions on commits page Closes #14006 * Screenshot: ![todo-commit](/uploads/5d34de0b7afcea7548123dafddf60c45/todo-commit.png) See merge request !3262
2016-03-18Merge branch 'fix/14388' into 'master' Douwe Maan
Fix an issue when the target branch of a MR had been deleted Before displaying the "diverged commits" note, we're checking if the MR is open, but we should check if it's mergeable instead because this check ensure the source and target branches exist. This was introduced by !2217 and fixes #14388. See merge request !3294
2016-03-18Merge branch 'fix-mr-source-sha' into 'master' Douwe Maan
Fix MergeRequest#source_sha when there is no diff Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14170 ### Overview This MR fixes an unhandled Exception when visiting the page of an open Merge Request without diff. ### Description `MergeRequest#source_sha` is expected to return the sha of the source branch last commit. But when an open Merge Request has no diff (e.g. all commits have already been merged to the target branch), `merge_request.source_sha` incorrectly returns `nil`. This was without consequences before – but since !2217 was merged (a few days ago), it makes `Gitlab::Git::Commit.between` raise an "Unexpected nil argument" exception. This can be reproduced when visiting the http://localhost:3000/gitlab-org/gitlab-test/merge_requests/2 page on a fresh local Gitlab setup. This MR fixes the crash, by making sure that `source_sha` returns a correct result even when there is no diff available. I also added tests. @DouweM I believe you wrote most of this code in the first place ; does this looks correct to you, or is there a better way to resolve this issue maybe? See merge request !3135
2016-03-18Merge branch 'project-cache-worker-without-diverging' into 'master' Jacob Vosmaer
Removed diverging commit count calculation from Repository#build_cache Using a repository with 1000 branches the old `Repository#build_cache` method would take around 180 seconds to complete. Without calculating the diverging commit counts this method "only" takes around 60 seconds. See commit 28cc2413eb5ddf920ce0b5eed803121f8b884754 for more details. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14058 cc @rspeicher See merge request !3274
2016-03-18Merge branch 'issue-fade-load' into 'master'Jacob Schatz
Changing filter dropdowns shows loading Instead of doing a full refresh of the page - i've modified the filterResults method on the Issues object to work for this form as well ![issues](/uploads/3335f09f7df88b6d419de7fd3d6857d2/issues.gif) Closes #14359 See merge request !3237
2016-03-18Merge branch 'confidential-issues' into 'master' Douwe Maan
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
2016-03-18Merge branch 'hide-large-diffs' into 'master' Jacob Vosmaer
Show a notice for diffs that are empty/too large This builds upon https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 but will fail until said MR has been merged. Fixes gitlab-org/gitlab-ce#13912, gitlab-org/gitlab-ce#13644, gitlab-org/gitlab-ce#13557, gitlab-org/gitlab-ce#13267, gitlab-org/gitlab-ce#3906 See merge request !3185
2016-03-17Cache project avatars stored in GitYorick Peterse
The avatar logic has been moved from Project to Repository as this makes caching easier. The logic itself in turn has been changed so that the logo file names are cached in Redis. This cache is flushed upon pushing a commit but _only_ if: 1. The commit was pushed to the default branch 2. The commit actually changes any of the logo files If no branch or commit is given the cache is flushed anyway, this ensures that calling Repository#expire_cache without any arguments still flushes the avatar cache (e.g. this is used when removing a project). Fixes gitlab-org/gitlab-ce#14363
2016-03-17Merge branch 'glalonde-triggerbuild' into 'master' Kamil Trzciński
Adjusted behavior so canceled builds tagged as allowed to fail do not fail build ## What does this MR do? This diff changes the 'Allowed to fail' flag to also ignore canceled builds, whereas before, canceled builds could fail the suite even if they were marked as 'Allowed to fail' dupe of !3258 to force a build ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? Unexpected behavior as a user ## What are the relevant issue numbers? ## Screenshots (if relevant) ![whatisgoingon](/uploads/fcd7c8f3d8454bc730d7fd41eff59b31/whatisgoingon.png) See merge request !3271
2016-03-17adjusted behavior so canceled builds tagged as allowed to fail do not fail buildGeoffrey Lalonde
2016-03-17Merge branch '4009-external-users' into 'master' Douwe Maan
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
2016-03-17Fix specsZeger-Jan van de Weg
Spinach was right, I was a fool..
2016-03-17Merge branch 'master' into new-branch-button-issueZeger-Jan van de Weg
2016-03-17API support for setting External flag on existing usersZeger-Jan van de Weg
2016-03-17Fix wiki search results point to raw sourceHiroyuki Sato
2016-03-16Merge branch 'issue_14306' into 'master' Robert Speicher
Return an empty Array when there aren't lines to parse. Fixes #14306 See merge request !3243
2016-03-16Merge branch 'worker-for-user-deletion' into 'master' Douwe Maan
A worker deletes a user, so the request doesn't time out Fixes #13261 See merge request !2855
2016-03-16Return an empty Array when there aren't lines to parse.Rubén Dávila
2016-03-16Merge branch 'fix-capybara-deprecation-warnings' into 'master' Robert Speicher
Fix Capybara 2.6.2 deprecation warnings See merge request !3236
2016-03-16Specs for the DeleteUserServiceZeger-Jan van de Weg
2016-03-15Incorporate the review and update specZeger-Jan van de Weg
The feature spec now also tests the absence of the new branch button
2016-03-15Clearify who deletes the userZeger-Jan van de Weg
2016-03-15Fix broken specsZeger-Jan van de Weg
2016-03-15Target right release, rebase got it wrongZeger-Jan van de Weg
2016-03-15Specs on force deleting of a userZeger-Jan van de Weg
2016-03-15A worker deletes a user, so the request doesn't time outZeger-Jan van de Weg
Fixes #13261
2016-03-15Incorporate reviewZeger-Jan van de Weg
2016-03-15Enhance new branch button on an issueZeger-Jan van de Weg
2016-03-15new-branch-buttonZeger-Jan van de Weg
2016-03-15Merge branch 'master' into 4009-external-usersZeger-Jan van de Weg
2016-03-15Fix Capybara 2.6.2 deprecation warningsStan Hu
2016-03-15Improving the original label-subscribing implementationRémy Coutable
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
2016-03-15Original implementation to allow users to subscribe to labelsTimothy Andrew
1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
2016-03-15Merge branch 'fix-activerecord-join-stupidity' into 'master' Robert Speicher
Ignore eager loading in Project.search UNION This fixes issues such as filtering groups by names on pages such as https://gitlab.com/dashboard/groups. See merge request !3229
2016-03-15Merge branch 'revert-avatar-cropping' into 'master' Rémy Coutable
Revert the avatar cropping feature Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping See merge request !3223
2016-03-15Ignore eager loading in Project.search UNIONYorick Peterse
The queries that are UNION'd together don't need any eager loading (since we really only use the resulting SQL instead of having ActiveRecord actually run the queries). By dropping any eager loaded associations queries such as the following work instead of producing a SQL error: Project.all.includes(:namespace).search('foo')
2016-03-15Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master' Douwe Maan
Fixes "iid of max iid" in Issuable sidebar for merged MR Fixes #13928. See merge request !3046
2016-03-15Merge branch 'fix/ensure-no-new_ssh_key_email-dead-jobs' into 'master' Douwe Maan
Ensure "new SSH key" email do not ends up as dead Sidekiq jobs Related to #2235. This is done by: 1. Delaying the notification sending after the SSH key is commited in DB 2. Gracefully exit the mailer method if the record cannot be found /cc @dblessing @stanhu @DouweM See merge request !3163
2016-03-15Revert "Merge branch 'avatar-cropping' into 'master' "Rémy Coutable
This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
2016-03-15Merge branch 'auto-gc' into 'master' Douwe Maan
Run 'git gc' every 10 pushes Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14250 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12620 Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/254 Associated gitlab-shell MR: https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/44 See merge request !3206
2016-03-15Ensure "new SSH key" email do not ends up as dead Sidekiq jobsRémy Coutable
Related to #2235. This is done by: 1. Delaying the notification sending after the SSH key is commited in DB 2. Gracefully exit the mailer method if the record cannot be found
2016-03-15Use an exception to pass messagesJacob Vosmaer
2016-03-15Merge branch 'rs-issue-14220' into 'master' Douwe Maan
Be more intelligent about sanitizing links with unsafe protocols This prevents false matches on relative links like `[database](database.md)`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14220 See merge request !3210
2016-03-15Merge branch 'fix-commit-status-rendering' into 'master' Robert Speicher
Cleanup Ci::Commit, Ci::Build and CommitStatus views This MR tries to do first sweep of cleanups to Ci::Commit and Ci::Build objects removing all view-related functions and fixing the API from other side. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/6046 See merge request !2760