summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cache-raw-2' into 'master' Douwe Maan2016-03-071-0/+3
|\
| * 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
|\ \
| * | 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
| * | Eager load Issues/MRs project for Milestone.Rubén Dávila2016-03-041-2/+2
| * | Refactor GlobalMilestone queries.Rubén Dávila2016-03-044-14/+15
* | | Merge branch 'feature/cross-project-labels' into 'master' Douwe Maan2016-03-071-10/+34
|\ \ \
| * | | 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 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
|\ \ \ \ \
| * | | | | 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 modelrs-remove-difflineRobert Speicher2016-03-051-3/+0
| |/ / / / /
* | | | | | Merge branch 'rs-note-reuse-for-methods' into 'master' Douwe Maan2016-03-071-2/+2
|\ \ \ \ \ \
| * | | | | | Make better use of the `Note#for_*?` methodsrs-note-reuse-for-methodsRobert Speicher2016-03-051-2/+2
| |/ / / / /
* | | | | | Remove `Note#system?` "override"rs-note-model-cleanupRobert Speicher2016-03-051-4/+0
* | | | | | Remove `Note#noteable_type_name`Robert Speicher2016-03-051-4/+0
|/ / / / /
* | | | | Merge branch 'issue-sidebar-mobile' into 'master' Dmitriy Zaporozhets2016-03-051-0/+10
|\ \ \ \ \
| * | | | | Change icons for open close on issue/MRJacob Schatz2016-03-041-0/+10
| | |_|/ / | |/| | |
* | | | | Move `update_merge_request` ability to DeveloperRobert Speicher2016-03-041-1/+1
|/ / / /
* | | | 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 projectsrenaming-repository-cachingYorick Peterse2016-02-261-0/+18
* | | Merge branch 'issue_4095' into 'master' Dmitriy Zaporozhets2016-03-032-1/+2
|\ \ \ | |_|/ |/| |
| * | Don't list issues from archived projects in Group view.Rubén Dávila2016-03-022-1/+2
* | | Merge branch 'issue_13501' into 'master' Robert Speicher2016-03-021-0/+5
|\ \ \
| * | | Add open_merge_requests_count methodAlfredo Sumaran2016-03-011-0/+4
| * | | Add association to merge requestsAlfredo Sumaran2016-03-011-0/+1
| |/ /
* | | Merge branch 'issue_13623' into 'master' Douwe Maan2016-03-021-10/+3
|\ \ \
| * | | Little refactor for milestone_remaining_days helper from last code review.issue_13623Rubén Dávila2016-03-011-2/+1
| * | | Show days remaining instead of elapsed time for Milestone.Rubén Dávila2016-03-011-10/+4
| |/ /
* | | Add some specs for Repository#revert.issue_13716Rubén Dávila2016-03-011-1/+1
* | | Check for conflicts before creating target branch.Rubén Dávila2016-03-011-12/+20
|/ /
* | Merge branch 'rs-avatar-validation' into 'master' Douwe Maan2016-03-011-1/+1
|\ \
| * | Only validate avatar cropping values when avatar is present AND changedrs-avatar-validationRobert Speicher2016-02-291-1/+1
* | | Merge branch 'rs-fix-user-namespace_uniq' into 'master' Douwe Maan2016-03-011-1/+2
|\ \ \ | |/ /
| * | Properly check for a pre-existing error in `User#namespace_uniq`rs-fix-user-namespace_uniqRobert Speicher2016-02-291-1/+2
* | | Reset `otp_grace_period_started_at` after disabling 2FARobert Speicher2016-02-291-5/+6
|/ /
* | Revert "Merge branch 'issue_5854' into 'master' "revert-6f85eb38Dmitriy Zaporozhets2016-02-291-4/+2
View Lorry Controller Status