summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change sleep to wait_for_ajaxbranch-delete-tooltipPhil Hughes2016-08-191-1/+3
|
* Added testsPhil Hughes2016-08-191-0/+22
|
* Destroy branch delete tooltip when row is removedPhil Hughes2016-08-191-1/+3
| | | | Closes #19528
* Merge branch '21039-member-invite-declined-email-wrong-arguments' into 'master' Rubén Dávila Santos2016-08-193-2/+41
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix notification_service argument error of declined invitation emails ## What does this MR do? Remove unused arguments that raised the argument error after a refactor, more details in the commit message. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## What are the relevant issue numbers? Closes #21039 ## Screenshots (if relevant) ## 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 - [x] 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 !5893
| * Fix notification_service argument error of declined invitation emailsPaco Guzman2016-08-193-2/+41
|/ | | | | | Removing unused access_level parameter. Bug introduced here -> 6d103a2f4764441b1650ba6d790732056c9a8516 access_level parameter wasn’t needed since -> 88c2639356e6e4b4b05d96584768e07a9ce4b048
* Merge branch 'labels-grammar' into 'master' Achilleas Pipinellis2016-08-191-2/+2
|\ | | | | | | | | | | | | | | | | Fix same tiny grammar mistake as in ee This is a tiny grammar fix that was already merged into EE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/667#note_14043471 See merge request !5865
| * fix same mistake as in eeDe Wet Blomerus2016-08-181-2/+2
| |
* | Merge branch 'diff-line-comment-vuejs' into 'master' Douwe Maan2016-08-1976-137/+3629
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff line comments resolve ## What does this MR do? Diff line comments can be resolved. Part of #10325 To do: - [x] Backend (@DouweM) - [x] Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13319326. Will be made easier by https://gitlab.com/gitlab-org/gitlab-ce/issues/17237#note_13370331 - [x] System note when all discussions are resolved - [x] Notification when all discussions are resolved - [x] Write unit tests - [x] Look at resolve time https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13912743 - Fixed by 4a13aa9 - [x] Frontend (@iamphill) - [x] Fix bugs - [x] Write more feature tests - [x] Frontend (@connorshea) - [x] Address frontend feedback - [x] Feature specs for Jump feature - [x] Documentation - [x] Add Vue.js in a standard way See merge request !5022
| * | Fix expansion of discussions in diffdiff-line-comment-vuejsDouwe Maan2016-08-183-5/+3
| | |
| * | Improve performance of MR show pageDouwe Maan2016-08-189-22/+33
| | |
| * | Fix jumping between discussions on changes tabDouwe Maan2016-08-181-0/+1
| | |
| * | Fix MR note discussion IDDouwe Maan2016-08-181-1/+3
| | |
| * | Remove right margin on Jump button iconDouwe Maan2016-08-181-2/+6
| | |
| * | Fix bug causing “Jump to discussion” button not to showDouwe Maan2016-08-182-11/+7
| | |
| * | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-1856-139/+1379
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ \ Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1852-176/+844
| |\ \ \
| * | | | Fix class method definitionDouwe Maan2016-08-171-1/+1
| | | | |
| * | | | Add changelog entryDouwe Maan2016-08-171-0/+1
| | | | |
| * | | | Function should return a boolean.Connor Shea2016-08-171-1/+1
| | | | |
| * | | | Forgot another one.Connor Shea2016-08-171-0/+2
| | | | |
| * | | | Fix a lingering conflict.Connor Shea2016-08-171-5/+1
| | | | |
| * | | | Fix more incomplete if/else statements.Connor Shea2016-08-172-0/+8
| | | | |
| * | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-17153-179/+8177
| |\ \ \ \
| * | | | | Store discussion_id on Note for faster discussion lookup.Douwe Maan2016-08-1713-47/+191
| | | | | |
| * | | | | Remove non-standard VueJS files from vendor.Connor Shea2016-08-173-11391/+2
| | | | | |
| * | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-1718-124/+11801
| |\ \ \ \ \
| * | | | | | Add return statements for if statements that were missing them.Connor Shea2016-08-171-0/+4
| | | | | | |
| * | | | | | Merge branch 'master' into diff-line-comment-vuejsConnor Shea2016-08-16241-917/+4136
| |\ \ \ \ \ \
| * | | | | | | Add documentation for discussion resolution.Connor Shea2016-08-166-8/+40
| | | | | | | |
| * | | | | | | Init commit on documentation for resolving inline comments in MRsAchilleas Pipinellis2016-08-171-0/+8
| | | | | | | |
| * | | | | | | Remove accidental addition of table and index.Connor Shea2016-08-161-10/+0
| | | | | | | |
| * | | | | | | Add comment for v-cloak selector. [ci skip]Connor Shea2016-08-161-1/+2
| | | | | | | |
| * | | | | | | Fix Resolve All button.Connor Shea2016-08-161-5/+1
| | | | | | | |
| * | | | | | | Improve CSS for line comment resolution button.Connor Shea2016-08-161-5/+2
| | | | | | | |
| * | | | | | | Add test for jumping between discussions and unhiding toggled discussions.Connor Shea2016-08-161-0/+18
| | | | | | | |
| * | | | | | | Address review feedbackDouwe Maan2016-08-169-86/+116
| | | | | | | |
| * | | | | | | Resolve feedback.Connor Shea2016-08-153-9/+16
| | | | | | | |
| * | | | | | | Single quotes for consistency, cache 'this' selector.Connor Shea2016-08-151-3/+4
| | | | | | | |
| * | | | | | | Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-12606-6514/+9877
| |\ \ \ \ \ \ \
| * | | | | | | | Add specs for system note and email when all discussions are resolvedDouwe Maan2016-08-123-0/+111
| | | | | | | | |
| * | | | | | | | Add specs for NotesController and DiscussionsControllerDouwe Maan2016-08-125-4/+222
| | | | | | | | |
| * | | | | | | | Add specs for Discussion and MergeRequest modelsDouwe Maan2016-08-123-3/+712
| | | | | | | | |
| * | | | | | | | Don’t show “Resolve discussion” for non-author/membersDouwe Maan2016-08-125-14/+35
| | | | | | | | |
| * | | | | | | | Add specs for new Note and DiffNote methods.Douwe Maan2016-08-123-0/+303
| | | | | | | | |
| * | | | | | | | Fix a bug and a test.Connor Shea2016-08-101-4/+6
| | | | | | | | |
| * | | | | | | | Set color of resolve icon with CSS.Connor Shea2016-08-101-2/+6
| | | | | | | | |
| * | | | | | | | If the next discussion is closed, toggle it open.Connor Shea2016-08-091-0/+6
| | | | | | | | |
| * | | | | | | | Replace CSS border'd check icon with real icon.Connor Shea2016-08-093-9/+5
| | | | | | | | |
| * | | | | | | | Implement Jump behavior for Changes tabDouwe Maan2016-08-046-31/+131
| | | | | | | | |
| * | | | | | | | Actually don't send resolved notifications when deleting a noteDouwe Maan2016-08-042-4/+2
| | | | | | | | |
View Lorry Controller Status