summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rubocop/enable-identical-conditional-branches-cop' into 'master' Robert Speicher2016-07-081-9/+1
|\
| * Remove legacy conditional from irker service coderubocop/enable-identical-conditional-branches-copGrzegorz Bizon2016-07-081-8/+0
| * Enable Style/IdenticalConditionalBranches Rubocop copGrzegorz Bizon2016-07-081-2/+2
* | Merge branch 'yatish27/gitlab-ce-project-commit-range-comment' into 'master' Rémy Coutable2016-07-081-2/+2
|\ \
| * | Fix comment for project argument in commit_range.rbYatish Mehta2016-06-201-2/+2
* | | Memoize MR merged/closed events retrievalmemoize_merge_request_eventsPaco Guzman2016-07-081-2/+2
| |/ |/|
* | Merge branch 'feature/option-set-new-users-external' into 'master' Rémy Coutable2016-07-082-1/+2
|\ \
| * | Added setting to set new users by default as externalDravere2016-07-072-1/+2
* | | Merge branch 'prefer-scope' into 'master' Douwe Maan2016-07-071-4/+1
|\ \ \
| * | | Use scope rather than class methodprefer-scopeLin Jen-Shin2016-07-071-4/+1
| |/ /
* | | Merge branch 'prefer-ref' into 'master' Douwe Maan2016-07-072-4/+4
|\ \ \
| * | | Also use ref in Repository#commitprefer-refLin Jen-Shin2016-07-071-2/+2
| * | | Prefer ref rather than id because id is shadowing database idLin Jen-Shin2016-07-071-2/+2
| |/ /
* | | Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-072-13/+55
|\ \ \
| * | | Have `Project#open_branches` return branches that are matched by a wildcard p...18627-wildcard-branch-protectionTimothy Andrew2016-07-072-2/+6
| * | | Modify the frontend for wildcard protected branches.Timothy Andrew2016-07-051-0/+11
| * | | Support wildcard matches for protected branches at the model level.Timothy Andrew2016-07-052-13/+40
* | | | Merge branch 'new-diff-notes' into 'master' Douwe Maan2016-07-0711-203/+454
|\ \ \ \
| * | | | Make `DiffNote#update_position` privateDouwe Maan2016-07-071-19/+14
| * | | | We can't call private methods with `self.`Douwe Maan2016-07-071-5/+5
| * | | | Remove duplication, unused methods, and some other style thingsDouwe Maan2016-07-062-7/+1
| * | | | Make methods private that don't need to be publicDouwe Maan2016-07-061-43/+47
| * | | | Add some more code comments.Douwe Maan2016-07-062-2/+4
| * | | | Use stored start and head for MR diff without whitespaceDouwe Maan2016-07-061-2/+2
| * | | | On MRs being imported, commits aren't available yetDouwe Maan2016-07-061-1/+1
| * | | | Keep around DiffNote position commitsDouwe Maan2016-07-061-0/+13
| * | | | Allow reply-by-email with diff notesDouwe Maan2016-07-061-1/+28
| * | | | Automatically update diff note positions when MR is pushed toDouwe Maan2016-07-062-6/+61
| * | | | Support new diff notes on MRs with diff_refsDouwe Maan2016-07-063-1/+11
| * | | | Add DiffNote modelDouwe Maan2016-07-062-2/+105
| * | | | Extract parts of LegacyDiffNote into DiffOnNote concern and move part of resp...Douwe Maan2016-07-064-66/+76
| * | | | Add DiffFile#blob and #old_blobDouwe Maan2016-07-061-10/+0
| * | | | Add Timeless helper module to prevent updated_at from being updatedDouwe Maan2016-07-061-6/+1
| * | | | Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-062-6/+17
| * | | | Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-063-63/+102
| * | | | Store diff head and start commit shas on MR diffsDouwe Maan2016-07-061-7/+10
| | |/ / | |/| |
* | | | Merge branch 'pending-delete-project-notifications' into 'master' Robert Speicher2016-07-071-1/+8
|\ \ \ \
| * | | | Exclude projects pending delete from notificationsSean McGivern2016-07-071-1/+8
| |/ / /
* | | | Escape file extension when parsing search results (!5141)winniehell2016-07-071-1/+1
|/ / /
* | | Merge branch '19092-fix-event-for-legacydiffnote-not-considered-note' into 'm...Douwe Maan2016-07-061-2/+2
|\ \ \
| * | | Use a more future-proof check for Note/LegacyDiffNote19092-fix-event-for-legacydiffnote-not-considered-noteRémy Coutable2016-07-061-1/+1
| * | | Fix diff comments not showing up in activity feedRémy Coutable2016-07-041-2/+2
* | | | Merge branch 'gh-labels' into 'master' Robert Speicher2016-07-061-5/+9
|\ \ \ \
| * | | | Use CGI.unescapeHTML rather than doing the gsub with a mapDouglas Barbosa Alexandre2016-07-051-11/+1
| * | | | Move `unescape_html_entities` from LabelsHelper to Label modelDouglas Barbosa Alexandre2016-07-051-1/+11
| * | | | Render references for labels that name contains ?, or &Douglas Barbosa Alexandre2016-07-051-13/+3
| * | | | Allow '?', or '&' for label titlesDouglas Barbosa Alexandre2016-07-051-3/+17
* | | | | Merge branch 'fix/import-url-validator' into 'master' Robert Speicher2016-07-061-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-3017-84/+154
| |\ \ \ \
| * | | | | few changes based on feedbackJames Lopez2016-06-301-2/+2
View Lorry Controller Status