summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'start-with-iid-on-new-branch' into 'master' Rémy Coutable2016-04-141-2/+2
|\ | | | | | | | | | | | | 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-2/+2
| |
* | Merge branch 'simplify-gitlab-url_builder-15202' into 'master' Rémy Coutable2016-04-141-5/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor and expose only Gitlab::UrlBuilder.build(record) ``` $ git grep Gitlab::UrlBuilder app/models/commit.rb: url: Gitlab::UrlBuilder.build(self), app/services/issues/base_service.rb: issue_url = Gitlab::UrlBuilder.build(issue) app/services/merge_requests/base_service.rb: hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request) app/views/search/results/_note.html.haml:- note_url = Gitlab::UrlBuilder.build(note) lib/gitlab/note_data_builder.rb: base_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(note) spec/lib/gitlab/note_data_builder_spec.rb: expect(data[:object_attributes][:url]).to eq(Gitlab::UrlBuilder.build(note)) spec/lib/gitlab/url_builder_spec.rb:describe Gitlab::UrlBuilder, lib: true do ``` Fixes #15202. See merge request !3696
| * | Refactor and expose only Gitlab::UrlBuilder.build(record)simplify-gitlab-url_builder-15202Rémy Coutable2016-04-131-5/+1
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Allow empty recipient list when pusher is addedFrank Groeneveld2016-04-141-3/+7
| |/ |/| | | | | Closes #13574
* | Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master' Robert Speicher2016-04-131-10/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | 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-14/+19
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3/+3
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Fix a bug with trailing slash in teamcity_urlCharles May2016-04-121-13/+18
| | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/3515
* | | Merge branch 'issue_15044' into 'master' Rémy Coutable2016-04-132-6/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow to close invalid merge request fixes #15044 See merge request !3664
| * | | Add changelog entry, improve specs and model codeissue_15044Felipe Artur2016-04-121-9/+4
| | | |
| * | | Allow to close invalid merge requestFelipe Artur2016-04-112-5/+12
| |/ /
* | | 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 'check-import-job-status' into 'master' Robert Speicher2016-04-121-2/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Check and report import job status to help diagnose issues with forking There are no functional changes, but adding checks/logs for Sidekiq job IDs to help track down why many users seem to get stuck fork/import jobs. See merge request !3672
| * | | Check and report import job status to help diagnose issues with forkingStan Hu2016-04-111-2/+8
| |/ /
* | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-129-100/+54
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple membership and notifications This allow you to have notification setting per project even if you are member of group. It also creates background for having notification settings in project you are not member of. - [x] Make it work - [x] Migrations - [x] CHANGELOG - [x] More tests - [x] API For #3359 After this merge request there is still some work to be done: * create migration that remove duplicates in notification settings table and create uniq index (8.8 probably) * remove notification_level field from Member model in 9.0 * make proper API for notification settings * use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) * maybe more tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3421
| * | Reuse `User#notification_settings_for` when it's possibleDouglas Barbosa Alexandre2016-04-111-1/+1
| | |
| * | Use Hash instead of Array on NotificationSetting#level enumDouglas Barbosa Alexandre2016-04-111-3/+1
| | |
| * | Add method to return the user notification setting for a group, or a projectDouglas Barbosa Alexandre2016-04-081-0/+4
| | |
| * | Use default_value_for to set default NotificationSetting#levelDouglas Barbosa Alexandre2016-04-081-8/+6
| | |
| * | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-0817-47/+57
| |\ \ | | |/
| * | Fix few bugs related to recent notifications refactoringDmitriy Zaporozhets2016-03-301-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Refactor creating notification setting with defaultsDmitriy Zaporozhets2016-03-302-6/+12
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove useless Notification modelDmitriy Zaporozhets2016-03-303-19/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Small refactoring and cleanup of notification logicDmitriy Zaporozhets2016-03-304-48/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Update NotificationService to use NotificationSettings instead of membershipDmitriy Zaporozhets2016-03-306-36/+11
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Create notification setting when membership createdDmitriy Zaporozhets2016-03-301-0/+10
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Introduce NotificationSetting to user interfaceDmitriy Zaporozhets2016-03-303-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | * visiting project will create notification setting if missing * change notification setting per project even without membership * use notification settings instead of membership on profile page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Introduce NotificationSetting modelDmitriy Zaporozhets2016-03-301-0/+14
| | | | | | | | | | | | | | | | | | | | | 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>
* | | Dont return nullJeroen Bobbeldijk2016-04-111-1/+1
| | |
* | | Add changelog, change code to guard clauseJeroen Bobbeldijk2016-04-111-3/+3
| | |
* | | Check head unborn in ruggedJeroen Bobbeldijk2016-04-111-1/+1
| |/ |/|
* | Expire caches after project creation to ensure a consistent stateStan Hu2016-04-071-0/+2
| | | | | | | | Closes #14961
* | Ensure empty recipients are rejected in BuildsEmailServiceRémy Coutable2016-04-061-4/+7
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Flush repository cache before import project datafix-gh-pr-importDouglas Barbosa Alexandre2016-04-041-0/+5
| | | | | | | | | | GitHub Pull Requests importer handle with the repository while importing data, we need to make sure that the cached values are valid.
* | Merge branch 'fix_remove_fork_link' into 'master' Douwe Maan2016-04-042-10/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove fork link closes all merge requests opened on source project Currently, if you: - create a fork - open a merge request on the source project - remove the fork link The created MR cannot be closed. With this MR, all pending MR is closed when the fork link is removed. See merge request !3189
| * | Move unlink fork logic to a serviceBaldinof2016-03-221-20/+0
| | |
| * | Merge branch 'master' into fix_remove_fork_linkBaldinof2016-03-1413-39/+295
| |\ \
| * | | Close merge requests when removing fork relationBaldinof2016-03-112-1/+12
| | | |
* | | | Merge branch 'update_repository_from_ee' into 'master' Douwe Maan2016-04-041-6/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repository#local_branches from gitlab-ee. REF: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/249 This will help us to avoid posible merge conflicts when merging gitlab-ce to gitlab-ee See merge request !3496
| * | | | Migrate Repository#local_branches from gitlab-ee.update_repository_from_eeRubén Dávila2016-04-011-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | This will help us to avoid posible merge conflicts when merging gitlab-ce to gitlab-ee
* | | | | Merge branch 'issue_14853' into 'master' Yorick Peterse2016-04-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix bug related to filtering Issues by Label/Milestone. See merge request !3499
| * | | | | Fix bug related to filtering Issues by Label/Milestone.issue_14853Rubén Dávila2016-04-021-1/+1
| |/ / / / | | | | | | | | | | | | | | | This problem only was affecting the dev env.
* | | | | Merge branch 'fix-bad-fetch' into 'master' Douwe Maan2016-04-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Don't fetch any tags from a forked repo Closes #13957 See merge request !3504
| * | | | Don't fetch any tags from a forked repoStan Hu2016-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | Closes #13957
* | | | | Merge branch 'routing' into 'master' Robert Speicher2016-04-014-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added & use Gitlab::Routing for URL helpers Extracted from !3389 See merge request !3486
| * | | | | Added & use Gitlab::Routing for URL helpersroutingYorick Peterse2016-04-014-5/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails' "url_helpers" method creates an anonymous Module (which a bunch of methods) on every call. By caching the output of this method in a dedicated method we can shave off about 10 seconds of loading time for an issue with around 200 comments.
* | | | | Merge branch 'memoize-pattern-methods' into 'master' Robert Speicher2016-04-018-13/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Memoize reference_pattern/link_reference_pattern Extracted from !3389 See merge request !3485
| * | | | | Memoize reference_pattern/link_reference_patternmemoize-pattern-methodsYorick Peterse2016-04-018-13/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | These methods are called quite often in loops so by memoizing their output we can reduce timings a bit.
View Lorry Controller Status