summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Use HAML class syntax in diff line partialsDouwe Maan2016-07-072-5/+5
|
* 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-064-9/+5
|
* 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
|
* 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 ↵Douwe Maan2016-07-068-76/+82
| | | | responsibility to other classes
* 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
| | | | consistent
* 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 working ## What does this MR do? Due to the `.json` at the end of the build URL fetch, the page wont correctly auto-reload the build log. This fixes that. See merge request !5110
| * 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 names ## What does this MR do? Removes `pluralize` from stage names ## What are the relevant issue numbers? Closes #18283 Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-06_at_11.11.39_AM](/uploads/b1b2dd00dc8aacc6dff40cab1fe1ecdd/Screen_Shot_2016-07-06_at_11.11.39_AM.png) cc @ayufan See merge request !5117
| * | Get rid of pluralize on stage namesAnnabel Dunstone2016-07-062-2/+2
| | |
* | | Merge branch '18858-options-dropdown-on-mobile-should-be-full-width' into ↵Jacob Schatz2016-07-061-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Added 100% width to open dropdown menus on mobile ## What does this MR do? Sets dropdown-menus to be 100% width on small screens. ## Are there points in the code the reviewer needs to double check? Do we want this on all dropdown menus or only dropdown menus activated by full-width buttons? /cc @dzaporozhets ## Why was this MR needed? Mobile UX. ## What are the relevant issue numbers? Closes #18858. ## Screenshots (if relevant) ![Screen_Shot_2016-06-22_at_00.14.09](/uploads/bd61721896bfac8af951374c2547acd6/Screen_Shot_2016-06-22_at_00.14.09.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4844
| * | | 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
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Cancel creating or editing note by hitting Escape /cc @rspeicher See merge request !5075
| * | | 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 minute ## What does this MR do? Throttle the update of `project.pushes_since_gc` to alleviate DB load ## What are the relevant issue numbers? Relates to #15094 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - ~~[ ] Added for this feature/bug~~ - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5083
| * | | | 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 ↵Douwe Maan2016-07-061-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix diff comments not showing up in activity feed ## What does this MR do? It fixes the detection of note events to check for `Note` and `LegacyDiffNote`. ## Are there points in the code the reviewer needs to double check? No? /cc @DouweM (since I believe you introduced `LegacyDiffNote` ## Why was this MR needed? To fix #19092. ## What are the relevant issue numbers? Fixes #19092. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5069
| * | | | | Use a more future-proof check for Note/LegacyDiffNote19092-fix-event-for-legacydiffnote-not-considered-noteRémy Coutable2016-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fix diff comments not showing up in activity feedRémy Coutable2016-07-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'gh-labels' into 'master' Robert Speicher2016-07-064-13/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow `?`, or `&` for label names Closes #18727 See merge request !4724
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing URL validation for import_url on projects Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17536 This MR fixes problems related to bypassing `import_url` validation on projects. This makes sure the URL is properly validated so we don't enter crap and fail while running workers that handle this URL. It also adds a migration to fix current invalid `import_url`s See merge request !4753
| * | | | | | 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 ↵James Lopez2016-06-30103-319/+625
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/import-url-validator # Conflicts: # spec/models/project_spec.rb
View Lorry Controller Status