summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* add SHA256 to secure_comparefix/token-timing-attackJames Lopez2016-03-082-3/+3
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-0817-208/+250
|\ | | | | | | fix/token-timing-attack
| * Merge branch 'master' into 'master' Yorick Peterse2016-03-081-0/+6
| |\ | | | | | | | | | | | | adds language names to projects list [image attached] See merge request !3000
| | * moves the main_language update logic to git push servicetiagonbotelho2016-03-071-8/+0
| | |
| | * removes automatic setting of main_language to project for it to set a main ↵tiagonbotelho2016-03-071-10/+0
| | | | | | | | | | | | language you have now to make a commit to the project
| | * fixes typotiagonbotelho2016-03-071-1/+1
| | |
| | * removes redundant selftiagonbotelho2016-03-071-1/+1
| | |
| | * adds tests and fixes some broken code to main language mrtiagonbotelho2016-03-071-3/+3
| | |
| | * adds swp and swo to gitignore and improves migration for project main_languagetiagonbotelho2016-03-073-6/+18
| | |
| | * removes unused methods that I forgottiagonbotelho2016-03-072-16/+0
| | |
| | * implements project languages saving them onto the databasetiagonbotelho2016-03-072-0/+12
| | |
| | * moves method to repository modeltiagonbotelho2016-03-072-7/+13
| | |
| | * changes if ! to unless and now asks for language instead of languagestiagonbotelho2016-03-071-3/+4
| | |
| | * adds cache to languages listtiagonbotelho2016-03-071-4/+4
| | |
| | * adds language names to projects list github styletiagonbotelho2016-03-071-0/+9
| | |
| * | Merge branch 'cache-raw-2' into 'master' Douwe Maan2016-03-071-0/+3
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | Set cache headers for raw blobs This changes allows browsers and (in the case of public projects) proxy caches to cache raw Git blob responses. See merge request !3113
| | * Refactor caching codeJacob Vosmaer2016-03-071-0/+3
| | |
| | * Revert changes in the Project modelJacob Vosmaer2016-03-071-4/+3
| | |
| | * Tell clients/proxies to cache raw blob requestsJacob Vosmaer2016-03-031-3/+4
| | |
| * | Merge branch 'issue_13621_2' into 'master' Douwe Maan2016-03-077-76/+44
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Labels should be visible in dashboard and group milestone views Closes #13621 See merge request !2931
| | * | Updates from last code review.issue_13621_2Rubén Dávila2016-03-067-78/+39
| | | |
| | * | Refactor Merge Requests tab into a custom partialRubén Dávila2016-03-041-0/+6
| | | | | | | | | | | | | | | | | | | | * Add Labels tab to Groups * Add decorator for label so it's aware of Milestones.
| | * | Eager load Issues/MRs project for Milestone.Rubén Dávila2016-03-041-2/+2
| | | | | | | | | | | | | | | | | | | | With this change we avoid doing N+1 queries when viewing Milestone's Issues/MRs from a Group context.
| | * | Refactor GlobalMilestone queries.Rubén Dávila2016-03-044-14/+15
| | | | | | | | | | | | | | | | Make methods return ActiveRecord Relations instead of Arrays.
| * | | Merge branch 'feature/cross-project-labels' into 'master' Douwe Maan2016-03-071-10/+34
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for cross project references for labels ## Summary Support for cross project references for labels. ## Rationale 1. Cross project label references are currently not supported in GitLab 1. `to_reference` method signature in `Label` model breaks the abstraction introduced in `Referable`. `concerns/referable.rb: def to_reference(_from_project = nil)` Signatures: ``` label.rb: def to_reference(format = :id) commit_range.rb: def to_reference(from_project = nil) commit.rb: def to_reference(from_project = nil) external_issue.rb: def to_reference(_from_project = nil) group.rb: def to_reference(_from_project = nil) issue.rb: def to_reference(from_project = nil) merge_request.rb: def to_reference(from_project = nil) milestone.rb: def to_reference(from_project = nil) project.rb: def to_reference(_from_project = nil) snippet.rb: def to_reference(from_project = nil) user.rb: def to_reference(_from_project = nil) ``` This MR suggests using `def to_reference(from_project = nil, format: :id)` which makes use of keyword arguments and preserves abstract interface. 1. We need support for cross project label references when we want to move issue to another project It may happen that issue description, system notes or comments contain reference to label and this reference will be invalid after moving issue to another project and will not be displayed correctly unless we have support for cross project references. Merge request that needs this feature: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2831 I think that cross project label references may be useful, (example: `Hey, see our issues for CI in GitLab CE! - gitab-org/gitlab-ce~"CI"`). cc @JobV @DouweM @rspeicher See merge request !2966
| | * | | Remove redundant code in cross project labels implementationGrzegorz Bizon2016-03-031-3/+4
| | | | |
| | * | | Mention cross-project labels in markdown documentationGrzegorz Bizon2016-03-031-0/+4
| | | | |
| | * | | Add additional text prefix in cross project labelsGrzegorz Bizon2016-03-031-1/+2
| | | | |
| | * | | Add support for cross project references for labelsGrzegorz Bizon2016-03-031-1/+6
| | | | |
| | * | | Add cross project references support for label modelGrzegorz Bizon2016-03-031-4/+20
| | | | |
| | * | | Add support for keyword arguments in label reference methodGrzegorz Bizon2016-03-031-6/+3
| | | | |
| * | | | Merge branch 'indicate-mr-diverged-from-target' into 'master' Douwe Maan2016-03-071-0/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Indicate when an MR diverged from the target branch This adds an indicator to the "Merge MR" box, to tell if and how much an MR diverged from its target branch. For instance, consider an MR to merge the branch `feature` into `master`. Some other commits were added to `master` since `feature` was created, and the two branches diverged. ```text o master | o o feature | | o o | / o ``` In this case, there will be a label in the MR Merge box stating: > This MR is by 3 commits behind the target branch `master`. ## Screenshots ### The branch diverged from the target (UI Proposal) ![UI_suggestion_1](/uploads/cd5bee3959e68026ec7d5097259d53f4/UI_suggestion_1.png) ### The branch diverged from the target (alternative UI Proposal) ![UI_suggestion_2](/uploads/f36977101b59a610850e129837dfbc83/UI_suggestion_2.png) ## How is this useful? - In a _rebase-workflow_ (MR are preferably rebased before being merged), the reviewer wants to know if an MR is rebased on the target branch before merging it. _With this indicator, the reviewer knows immediately if the branch is rebased, or if she needs to ask the committer to rebase its branch._ <br> - To keep the git history readable, a team prefers to avoid merging branches that really lag a lot behind the target branch. Merging an MR that is 10 commits behind is fine, but 200 is too much. _With this indicator, the reviewer can see on the MR page if the branch is really far behind the target – or only a few commits behind._ ## Open questions We've been using this at @captaintrain for a few months now, and found it quite useful. I guess the open-questions are mostly: what UI would be the more adequate? Any thoughts on this, on the general usefulness and/or on the code? See merge request !2217
| | * | | | Indicate how much an MR branch diverges from the target branchPierre de La Morinerie2016-03-031-0/+23
| | | | | |
| * | | | | Merge branch 'rs-note-delegates-mentionable'Douwe Maan2016-03-071-10/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/note.rb
| | * | | | | Delegate a Note's Mentionable methods to its noteable objectrs-note-delegates-mentionableRobert Speicher2016-03-051-10/+1
| | | | | | |
| * | | | | | Merge branch 'rs-remove-diffline' into 'master' Douwe Maan2016-03-071-3/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused DiffLine model Added in Mar 2014. Only usage removed in Sep 2014. See merge request !3105
| | * | | | | | Remove unused DiffLine modelrs-remove-difflineRobert Speicher2016-03-051-3/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Added in Mar 2014. Only usage removed in Sep 2014.
| * | | | | | Merge branch 'rs-note-reuse-for-methods' into 'master' Douwe Maan2016-03-071-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make better use of the `Note#for_*?` methods We've got all these polymorphic type-checking methods, might as well use 'em everywhere it makes sense. See merge request !3106
| | * | | | | | Make better use of the `Note#for_*?` methodsrs-note-reuse-for-methodsRobert Speicher2016-03-051-2/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've got all these polymorphic type-checking methods, might as well use 'em everywhere it makes sense.
| * | | | | | Remove `Note#system?` "override"rs-note-model-cleanupRobert Speicher2016-03-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This method was duplicating default Rails behavior.
| * | | | | | Remove `Note#noteable_type_name`Robert Speicher2016-03-051-4/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This method was added in Dec 2012, its single use was removed two days later, and it's been there ever since.
| * | | | | Merge branch 'issue-sidebar-mobile' into 'master' Dmitriy Zaporozhets2016-03-051-0/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue sidebar mobile Fixes #13592 Fixes #14037 See merge request !3050
| | * | | | | Change icons for open close on issue/MRJacob Schatz2016-03-041-0/+10
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Button full width on phone on MR/issue.
| * | | | | Move `update_merge_request` ability to DeveloperRobert Speicher2016-03-041-1/+1
| |/ / / / | | | | | | | | | | | | | | | Closes #13663
| * | | | Merge remote-tracking branch 'origin/issue_5854'Dmitriy Zaporozhets2016-03-041-2/+4
| |\ \ \ \
| | * | | | Add commit message to JIRA's notification payload.Rubén Dávila2016-03-031-2/+4
| | |/ / /
| * | | | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-034-69/+68
| | |_|/ | |/| |
| * | | Merge branch 'renaming-repository-caching' into 'master' Rémy Coutable2016-03-031-0/+18
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Flush repository caches before renaming projects This should hopefully solve gitlab-org/gitlab-ce#13790. Once I know the exact steps to reproduce the problem I should be able to confirm this. cc @dblessing @inem See merge request !2974
| | * | Flush repository caches before renaming projectsrenaming-repository-cachingYorick Peterse2016-02-261-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that if a project is later re-created using the old path it doesn't end up re-using the old cache. This also ensures we don't keep the cache around until its expired by Redis itself. Fixes gitlab-org/gitlab-ce#13790
| * | | Merge branch 'issue_4095' into 'master' Dmitriy Zaporozhets2016-03-032-1/+2
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Don't show Issues/MRs from archived projects in Groups view Fixes #4095 See merge request !2980
View Lorry Controller Status