summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Expose shared groups for projectsapi-shared-groupsRobert Schilling2016-07-085-43/+118
|
* Merge branch 'issues-blank-state' into 'master' Jacob Schatz2016-07-0710-40/+71
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added blank state to issues ## What does this MR do? Adds new blank state to issues when no issues exist. Part of #18519 ## Screenshots (if relevant) ![Screen_Shot_2016-06-24_at_16.37.12](/uploads/0c3f385615b29216ef1137bd6fac06af/Screen_Shot_2016-06-24_at_16.37.12.png) See merge request !4908
| * Fixed spellingissues-blank-statePhil Hughes2016-07-062-11/+8
| | | | | | | | Used variable for icon color
| * Updated testsPhil Hughes2016-07-055-8/+11
| |
| * Uses any method instead of nil to check for issuesPhil Hughes2016-07-051-1/+1
| |
| * Added blank state to issuesPhil Hughes2016-07-055-31/+62
| |
* | Merge branch 'new-diff-notes' into 'master' Douwe Maan2016-07-0799-556/+4622
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New diff notes Fixes #12732, #14731, #19375, #14783 Builds on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4110 To do: - [x] Get it mostly working - [x] Validate position validity - [x] Fix: Don’t link to `#` - [x] Fix: Base ref can be `nil`, potentially, when the MR has an oprhan source branch => Yep, doesn’t work. We need to store a `start_id` - [x] Optimize: Fewer duplicate `git diff` compares - [x] Optimize: Pass paths to `PositionTracer#diff` for faster diffs - [x] Refactor: Use `head_id` in `MergeRequest`/`MergeRequestDiff` instead of `source_sha` - [x] Refactor: Convert existing array-based diff refs to the DiffRefs model - [x] Tweak: Use `note_type` in `Autosave` key - [x] Tweak: Remove `line_code: note.line_code` from `link_to_reply_discussion` - [x] Update: `SentNotifications` and reply-by-email receiver - [x] Update: MR diff notification email - [x] Update: API (MR, Commit note creation and entity) - [x] Update: GitHub importer - [x] Address any other TODO comments - [x] Fix: Suppress "edited 4 minutes ago" - [x] Write tests - [x] `LineMapper` - [x] `PositionTracer` - [x] `Position` - [x] `DiffPositionUpdateService` - [x] `DiffNote` - [x] `MergeRequests::RefreshService` / `MergeRequest#update_diff_notes_positions` - [x] Make sure commits with diff notes don't get cleaned up, since this would prevent the diff notes from being rendered (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5062) Future improvements: - Display unresolved comments on files outside the diff, if the comment was added when that file _was_ part of the diff - Allow commenting on sections between hunks, when expanding the diff using `...` - (We'd need to generate line code based on Position if we have it, even if it falls outside bounds of diff) - `diff_hunk` on diff note API entity - Show diff hunk in notification email - Resolved line notes would have a boolean, and be inactive through `notes.any? { !active? || resolved? }` - Multi line notes would store a number of positions, and do the right thing (™) in grouping and then rendering if the first item is multiline? => true - Image diff notes could store x,y,width,height instead of old_line,new_line for similar grouping. Does it need a reference to say if it's on old or new? These can't have line_codes, clearly. Rendering would be interesting. - Show commit line comments in the MR diff - Comment on specific selected words - Comment on file header - Unfold top of discussion diff note - New diff notes API for commits and MRs /cc @rspeicher See merge request !4101
| * | Add comment with diff to DiffPositionUpdateService specnew-diff-notesDouwe Maan2016-07-071-0/+104
| | |
| * | Use HAML class syntax in diff line partialsDouwe Maan2016-07-072-5/+5
| | |
| * | Make `DiffNote#update_position` privateDouwe Maan2016-07-072-58/+58
| | |
| * | Update test with new factory nameDouwe Maan2016-07-071-2/+2
| | |
| * | 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-066-18/+14
| | |
| * | Make methods private that don't need to be publicDouwe Maan2016-07-061-43/+47
| | |
| * | Add some more code comments.Douwe Maan2016-07-065-3/+20
| | |
| * | 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-064-11/+21
| | |
| * | Add tests for MergeRequest#reload_diffDouwe Maan2016-07-061-0/+40
| | |
| * | Add tests for DiffNoteDouwe Maan2016-07-061-0/+186
| | |
| * | Add tests for DiffPositionUpdateServiceDouwe Maan2016-07-061-0/+71
| | |
| * | Add tests for PositionDouwe Maan2016-07-061-0/+341
| | |
| * | Add tests for PositionTracerDouwe Maan2016-07-061-0/+1758
| | |
| * | Update schemaDouwe Maan2016-07-061-1/+7
| | |
| * | Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-0614-78/+622
| | |
| * | Allow reply-by-email with diff notesDouwe Maan2016-07-063-10/+51
| | |
| * | 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-068-22/+155
| | |
| * | Add Gitlab::Git::PositionTracerDouwe Maan2016-07-061-0/+168
| | |
| * | Add Gitlab::Diff::LineMapperDouwe Maan2016-07-062-0/+201
| | |
| * | Add Gitlab::Git::PositionDouwe Maan2016-07-062-0/+182
| | |
| * | Extract parts of LegacyDiffNote into DiffOnNote concern and move part of ↵Douwe Maan2016-07-0613-102/+120
| | | | | | | | | | | | responsibility to other classes
| * | Style diff and blob file headers the same wayDouwe Maan2016-07-068-54/+77
| | |
| * | Remove unneeded divDouwe Maan2016-07-063-8/+4
| | |
| * | Add DiffFile#blob and #old_blobDouwe Maan2016-07-066-25/+31
| | |
| * | Add Timeless helper module to prevent updated_at from being updatedDouwe Maan2016-07-062-6/+17
| | |
| * | Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-0620-57/+111
| | |
| * | Rename MergeRequest methods that return commits or shas to be more clear and ↵Douwe Maan2016-07-0625-128/+162
| | | | | | | | | | | | consistent
| * | Store diff head and start commit shas on MR diffsDouwe Maan2016-07-063-7/+20
| | |
* | | Merge branch 'pending-delete-project-notifications' into 'master' Robert Speicher2016-07-074-1/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude projects pending delete from notifications Make `NotificationSetting.for_projects` exclude projects that are excluded by the default scope on `Project`. (At the moment, that's projects with `pending_delete: true`.) See https://gitlab.com/gitlab-com/support-forum/issues/819 See merge request !5138
| * | | Exclude projects pending delete from notificationsSean McGivern2016-07-074-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the Sidekiq job fails for some reason, a project can be 'stuck' pending deletion. The project can't be viewed, so it shouldn't be available through the notification settings association as this will throw an exception when we try to show the link.
* | | | Merge branch 'issue_3946' into 'master' Robert Speicher2016-07-0721-296/+399
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve UI consistency for admin area Closes #3946 See merge request !4424
| * | | | Namespaces should filter remotelyAlfredo Sumaran2016-07-071-0/+1
| | | | |
| * | | | Rephrase deletion alert messageAlfredo Sumaran2016-07-071-1/+1
| | | | |
| * | | | Do not show Any Namespace option when neededAlfredo Sumaran2016-07-072-3/+5
| | | | |
| * | | | Layout for Users Groups and Projects on admin areaAlfredo Sumaran2016-07-0721-296/+396
| | | | |
* | | | | Merge branch 'dz-remove-icons' into 'master' Jacob Schatz2016-07-071-2/+0
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Remove icons from file edit tabs We don't need this icons and it also inconsistent with current UI See merge request !5072
| * | | | Remove icons from file edit tabsdz-remove-iconsDmitriy Zaporozhets2016-07-041-2/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status