summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | fix merge conflictsJames Lopez2016-06-2814-32/+98
| |\ \ \
| * | | | another fix and fixed specJames Lopez2016-06-221-0/+2
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-2212-51/+73
| |\ \ \ \
| * \ \ \ \ Merge branches 'fix/import-url-validator' and 'master' of gitlab.com:gitlab-o...James Lopez2016-06-2017-34/+213
| |\ \ \ \ \
| * | | | | | fixing URL validation for import_url on projectsJames Lopez2016-06-171-3/+1
* | | | | | | Revert back to not defining a default Git access protocol.Patricio Cano2016-07-051-1/+1
* | | | | | | Default Git access protocol to `web`Patricio Cano2016-07-051-1/+1
* | | | | | | Rename `enabled_git_access_protocols` to singular.Patricio Cano2016-07-051-1/+1
* | | | | | | Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] to conform to what GitLab Shell ...Patricio Cano2016-07-051-1/+1
* | | | | | | Only allow Git Access on the allowed protocolPatricio Cano2016-07-051-1/+2
* | | | | | | Add setting that allows admins to choose which Git access protocols are enabledPatricio Cano2016-07-051-0/+2
* | | | | | | Merge branch '18790-dont-show-request-button-to-project-owner' into 'master' Robert Speicher2016-07-051-5/+25
|\ \ \ \ \ \ \
| * | | | | | | Add a migration to remove requesters that are owners of their project18790-dont-show-request-button-to-project-ownerRémy Coutable2016-07-051-10/+12
| * | | | | | | Fix condition in Ability and start with cheaper checksRémy Coutable2016-07-051-7/+7
| * | | | | | | New :request_access ability to replace a ugly helperRémy Coutable2016-07-051-6/+24
* | | | | | | | Merge branch 'update-gemoji' into 'master' Robert Speicher2016-07-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add emoji.rb in lib/gitlab instead of using the gitlab_emoji gem.update-gemojiConnor Shea2016-06-291-1/+1
View Lorry Controller Status