summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* On MRs being imported, commits aren't available yetDouwe Maan2016-07-061-1/+1
* Keep around DiffNote position commitsDouwe Maan2016-07-061-0/+13
* Add send_git_patch helperDouwe Maan2016-07-062-7/+17
* Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-0610-63/+99
* Allow reply-by-email with diff notesDouwe Maan2016-07-061-1/+28
* Automatically update diff note positions when MR is pushed toDouwe Maan2016-07-065-9/+94
* Support new diff notes on MRs with diff_refsDouwe Maan2016-07-064-1/+12
* Add DiffNote modelDouwe Maan2016-07-062-2/+105
* Extract parts of LegacyDiffNote into DiffOnNote concern and move part of resp...Douwe Maan2016-07-068-76/+82
* Style diff and blob file headers the same wayDouwe Maan2016-07-067-44/+72
* Remove unneeded divDouwe Maan2016-07-063-8/+4
* Add DiffFile#blob and #old_blobDouwe Maan2016-07-065-20/+10
* 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-0610-26/+54
* Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-0611-89/+122
* Store diff head and start commit shas on MR diffsDouwe Maan2016-07-061-7/+10
* Merge branch 'build-auto-refresh' into 'master' Jacob Schatz2016-07-062-5/+5
|\
| * Fixed issue with build auto-refresh not workingbuild-auto-refreshPhil Hughes2016-07-062-5/+5
* | Merge branch '18283-pluralize-stage-headings' into 'master' Jacob Schatz2016-07-062-2/+2
|\ \
| * | Get rid of pluralize on stage namesAnnabel Dunstone2016-07-062-2/+2
* | | Merge branch '18858-options-dropdown-on-mobile-should-be-full-width' into 'ma...Jacob Schatz2016-07-061-0/+3
|\ \ \
| * | | Added 100% width to open dropdown menus on mobile18858-options-dropdown-on-mobile-should-be-full-widthLuke "Jared" Bennett2016-06-221-0/+3
* | | | Merge branch 'escape-to-cancel-note' into 'master' Jacob Schatz2016-07-061-9/+39
|\ \ \ \ | |_|/ / |/| | |
| * | | Use switch/when statementescape-to-cancel-noteDouwe Maan2016-07-051-21/+24
| * | | Double to single quotesDouwe Maan2016-07-041-1/+1
| * | | Add confirmation when canceling creating/editing with changesDouwe Maan2016-07-041-0/+12
| * | | Cancel creating or editing note by hitting EscapeDouwe Maan2016-07-041-5/+20
* | | | Merge branch '15094-throttling-pushes_since_gc' into 'master' Douwe Maan2016-07-061-2/+8
|\ \ \ \
| * | | | Throttle the update of `project.pushes_since_gc` to 1 minute15094-throttling-pushes_since_gcPaco Guzman2016-07-051-2/+8
* | | | | 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-064-13/+16
|\ \ \ \ \ \
| * | | | | | Fix unescaped strings in the labels dropdown templategh-labelsDouglas Barbosa Alexandre2016-07-061-2/+2
| * | | | | | Render label name contains ?, & in the labels dropdown without escapingDouglas Barbosa Alexandre2016-07-052-6/+5
| * | | | | | 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-052-12/+12
| * | | | | | Render references for labels that name contains ?, or &Douglas Barbosa Alexandre2016-07-053-15/+15
| * | | | | | Allow '?', or '&' for label titlesDouglas Barbosa Alexandre2016-07-052-5/+19
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix/import-url-validator' into 'master' Robert Speicher2016-07-062-3/+48
|\ \ \ \ \ \
| * | | | | | refactor url validator to use sanitizer for checkfix/import-url-validatorJames Lopez2016-07-011-3/+1
| * | | | | | few more changes from suggestionsJames Lopez2016-06-301-1/+0
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-30103-319/+625
| |\ \ \ \ \ \
| * | | | | | | few changes based on feedbackJames Lopez2016-06-302-10/+7
| * | | | | | | fix merge conflictsJames Lopez2016-06-2886-356/+450
| |\ \ \ \ \ \ \
| * | | | | | | | added more info on how addressable URI differs from what we use in UrlValidatorJames Lopez2016-06-241-1/+3
| * | | | | | | | updated validator based on feedbackJames Lopez2016-06-231-3/+3
| * | | | | | | | 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-22132-732/+1200
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fix commentJames Lopez2016-06-201-1/+1
View Lorry Controller Status