summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'start-with-iid-on-new-branch' into 'master' Rémy Coutable2016-04-141-5/+12
|\ | | | | | | | | | | | | Start with iid on branch creation After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name. See merge request !3708
| * Start with iid on branch creationZeger-Jan van de Weg2016-04-141-5/+12
| |
* | Allow empty recipient list when pusher is addedFrank Groeneveld2016-04-141-2/+35
|/ | | | Closes #13574
* Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master' Robert Speicher2016-04-131-52/+210
|\ | | | | | | | | | | | | | | | | Fix a bug with trailing slash in bamboo_url Also, improve specs for BambooService Similar to !3679. See merge request !3680
| * Fix a bug with trailing slash in bamboo_urlRémy Coutable2016-04-131-52/+210
| | | | | | | | | | | | | | | | Also, improve specs for BambooService Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/3515 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master' Robert Speicher2016-04-131-52/+199
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix trailing slash in teamcity_url Originally opened at !2309 by @ctmay4. As described in #3515, if you have trailing spaces in the the Teamcity server name, the service will not work properly. Switching from `URI.parse` to `URI.join` fixes it so that it works with or without a trailing slash. Fixes #3515. See merge request !3679
| * | Improve TeamcityService and its specsfix-trailing-slash-in-teamcity_url-3515Rémy Coutable2016-04-131-52/+199
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Fix repository cache invalidation issue when project is recreated with an ↵Stan Hu2016-04-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | empty repo To reproduce: 1. Create a project with some content 2. Rename the project 3. Create a new project with the same name. 4. Boom - 404. After step 2, the branch and tag counts were not being cleared. This would cause `repository.has_visible_content?` to erroneously return `true` for the newly-created project. Closes #13384
* | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-087-35/+115
|\ \ | |/
| * Expire caches after project creation to ensure a consistent stateStan Hu2016-04-071-0/+13
| | | | | | | | Closes #14961
| * Ensure empty recipients are rejected in BuildsEmailServiceRémy Coutable2016-04-061-2/+22
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Flush repository cache before import project datafix-gh-pr-importDouglas Barbosa Alexandre2016-04-041-0/+14
| | | | | | | | | | GitHub Pull Requests importer handle with the repository while importing data, we need to make sure that the cached values are valid.
| * Migrate Repository#local_branches from gitlab-ee.update_repository_from_eeRubén Dávila2016-04-011-4/+21
| | | | | | | | | | This will help us to avoid posible merge conflicts when merging gitlab-ce to gitlab-ee
| * Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into ↵Rémy Coutable2016-04-011-0/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allow temp-oauth-email as notification email Closes #14559 /cc @dblessing @rymai See merge request !3477
| | * Allow temp-oauth-email as notification emailerror-when-ldap-doesn-t-supply-an-email-address-14559Zeger-Jan van de Weg2016-03-311-0/+7
| | |
| * | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-1/+0
| | | | | | | | | | | | | | | | | | | | | I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857.
| * | Exclude projects pending deletion from all resultsZeger-Jan van de Weg2016-03-311-0/+9
| |/
| * Merge branch 'fix-todos' into 'master' Rémy Coutable2016-03-311-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Destroy related todos when an Issue/MR is deleted Closes #14550 Closes #14598 See merge request !3376
| | * Destroy related todos when an issue is deletedDouglas Barbosa Alexandre2016-03-301-0/+1
| | |
| * | Merge branch 'reorder-project-expire-cache' into 'master' Yorick Peterse2016-03-301-1/+1
| |\ \ | | | | | | | | | | | | | | | | Expire the exists cache before deletion to ensure project dir actually exists See merge request !3413
| | * | Expire the exists cache before deletion to ensure project dir actually existsStan Hu2016-03-271-1/+1
| | | | | | | | | | | | | | | | Closes #14659
| * | | minor cleanup in system_hook_specZeger-Jan van de Weg2016-03-301-27/+27
| | |/ | |/|
* | | Add spec for user_id uniq in NotificationSetting modelDmitriy Zaporozhets2016-03-301-1/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Small refactoring and cleanup of notification logicDmitriy Zaporozhets2016-03-301-0/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Introduce NotificationSetting modelDmitriy Zaporozhets2016-03-301-0/+15
|/ / | | | | | | | | | | | | It will hold notification setting per group or per project. It will allow get rid of notification level stored in Member model Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix_wip_in_mr_api' into 'master' Robert Speicher2016-03-291-4/+4
|\ \ | | | | | | | | | | | | | | | | | | Ensuring Merge Request API returns boolean values for work_in_progress Fixes #14692. See merge request !3432
| * | Ensuring Merge Request API returns boolean values for work_in_progressAbhi Rao2016-03-281-4/+4
| |/ | | | | | | Fixes #14692
* | Handle nil descriptions in Slack issue messagesStan Hu2016-03-281-0/+10
|/ | | | Closes #14676
* Merge branch 'handle-avatar-in-empty-repo' into 'master' Stan Hu2016-03-272-0/+12
|\ | | | | | | | | | | | | | | | | | | | | Don't attempt to look up an avatar in repo if repo directory does not exist Relates to https://sentry.gitlap.com/gitlab/gitlabcom/issues/3507/ Closes #14580 See merge request !3390
| * Don't attempt to look up an avatar in repo if repo directory does not existStan Hu2016-03-252-0/+12
| | | | | | | | Closes #14580
* | Merge branch 'ci-setup-info' into 'master' Dmitriy Zaporozhets2016-03-261-1/+20
|\ \ | |/ |/| | | | | | | | | | | | | Add links to CI setup documentation from project settings and builds pages For #14483 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3384
| * Small refactoring and rewordingDmitriy Zaporozhets2016-03-251-5/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Use head tree (cached) for file search. Also add some testsDmitriy Zaporozhets2016-03-241-0/+23
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Rename `Event#proper?` to `Event#visible_to_user?`Douglas Barbosa Alexandre2016-03-241-22/+22
| |
* | Comments on confidential issues doesn't show in activity feed to non-membersDouglas Barbosa Alexandre2016-03-241-14/+40
|/
* Do not allow to move issue if it has not been persistedmove-issue-section-should-not-be-displayed-in-the-new-issue-form-14489Grzegorz Bizon2016-03-231-0/+5
|
* Address feedbackDouwe Maan2016-03-222-4/+4
|
* Merge branch 'master' into issue_12658Douwe Maan2016-03-215-2/+145
|\ | | | | | | | | | | | | | | | | # 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 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-214-2/+135
| |\
| | * Merge branch 'issues-show-performance' into 'master' Robert Speicher2016-03-214-2/+85
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Cache output of Repository#exists?Yorick Peterse2016-03-193-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'master' into feature/issue-moveGrzegorz Bizon2016-03-202-21/+13
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-1910-21/+433
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * | | Prevent issue move if issue has been already movedGrzegorz Bizon2016-03-171-0/+50
| | | | |
| * | | | Soft delete issuablesZeger-Jan van de Weg2016-03-192-0/+10
| | |_|/ | |/| |
* | | | Fix specsDouwe Maan2016-03-201-2/+2
| | | |
* | | | Fix more specsDouwe Maan2016-03-201-3/+2
| | | |
* | | | Fix some specsDouwe Maan2016-03-201-5/+5
| | | |
* | | | Merge branch 'master' into issue_12658Douwe Maan2016-03-2010-49/+452
|\ \ \ \ | |/ / /