| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Only require `simple_po_parser` in rake task that needs itbvl-only-require-po-parser-in-rake | Bob Van Landuyt | 2017-09-04 | 3 | -2/+2 |
| | | | | | | That way we don't need to install it in production, since it's really not needed there. | ||||
| * | Update CHANGELOG.md for 9.5.3 | Jose Ivan Vargas | 2017-09-03 | 17 | -80/+18 |
| | | | | [ci skip] | ||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Jose Ivan Vargas | 2017-09-03 | 339 | -1844/+9459 |
| |\ | |||||
| | * | Merge branch 'issue-discussions-refactor' into 'master' | Jacob Schatz | 2017-09-02 | 137 | -455/+5457 |
| | |\ | | | | | | | | | | | | | Issue discussions Vue refactor See merge request !12069 | ||||
| | | * | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-08-31 | 140 | -626/+1100 |
| | | |\ | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb | ||||
| | | * \ | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-08-31 | 133 | -551/+1492 |
| | | |\ \ | |||||
| | | * | | | Fix specs | Douwe Maan | 2017-08-30 | 4 | -9/+16 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-08-30 | 521 | -3706/+8420 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb | ||||
| | | * | | | | IssueNotesRefactor: Fix broken specs. | Fatih Acet | 2017-08-29 | 2 | -1/+2 |
| | | | | | | | |||||
| | | * | | | | IssueNotesRefactor: Fix quick submit spec. | Fatih Acet | 2017-08-25 | 2 | -1/+2 |
| | | | | | | | |||||
| | | * | | | | Revert "Update yarn.lock" | Douwe Maan | 2017-08-23 | 1 | -19/+168 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fa482111a482abbe1e319df5c2b86250d6d8950c. | ||||
| | | * | | | | IssueNotesRefactor: Hide note reply form when submitted and show it again if ↵ | Fatih Acet | 2017-08-23 | 1 | -9/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | there is an error. | ||||
| | | * | | | | IssueNotesRefactor: Empty textarea while submitting comment and restore ↵ | Fatih Acet | 2017-08-23 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | content if request fails. | ||||
| | | * | | | | Update yarn.lock | Douwe Maan | 2017-08-23 | 1 | -168/+19 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-08-23 | 450 | -4538/+5232 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json | ||||
| | | * | | | | | IssueNotesRefactor: Show placeholder note immediately when editing. | Fatih Acet | 2017-08-23 | 3 | -7/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obviously not one of the best commits I always do. | ||||
| | | * | | | | | IssueNotesRefactor: Fix eslint errors. | Fatih Acet | 2017-08-23 | 3 | -17/+16 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Fix error messages of edit/reply failure for discussions. | Fatih Acet | 2017-08-23 | 3 | -10/+20 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Hide placeholders and flash messages before submitting a ↵ | Fatih Acet | 2017-08-22 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new note. | ||||
| | | * | | | | | IssueNotesRefactor: Support legacy multiple notes for individual_note: true ↵ | Fatih Acet | 2017-08-22 | 1 | -1/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | case. | ||||
| | | * | | | | | IssueNotesRefactor: Fix consistent typo. | Fatih Acet | 2017-08-22 | 4 | -5/+5 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Trigger change event for Vue to catch programmatically ↵ | Fatih Acet | 2017-08-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | value set. | ||||
| | | * | | | | | IssueNotesRefactor: Poll again when commands applied. | Fatih Acet | 2017-08-21 | 1 | -2/+4 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Fix GFM rendering after edits come in. | Fatih Acet | 2017-08-21 | 1 | -0/+3 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Show Cmd+Enter to comment tooltip. | Fatih Acet | 2017-08-21 | 4 | -12/+15 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: First comment and then close the issue. | Fatih Acet | 2017-08-21 | 1 | -8/+13 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Minor naming change to improve readability. | Fatih Acet | 2017-08-21 | 2 | -4/+4 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Reenable button after failed submit attempt. | Fatih Acet | 2017-08-21 | 3 | -5/+9 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Fix flash container positioning. | Fatih Acet | 2017-08-19 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Fix empty markdown render request. | Fatih Acet | 2017-08-18 | 1 | -25/+29 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Prevent anon user to try to add award. | Fatih Acet | 2017-08-18 | 4 | -3/+8 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Don’t explicitly check against undefined. | Fatih Acet | 2017-08-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Fix award handler. | Fatih Acet | 2017-08-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Fix edit button and emoji dropdown for anon user. | Fatih Acet | 2017-08-18 | 1 | -3/+6 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Support legacy last edited by case. | Fatih Acet | 2017-08-18 | 3 | -9/+11 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Fix discussion last updated text. | Fatih Acet | 2017-08-18 | 1 | -3/+21 |
| | | | | | | | | |||||
| | | * | | | | | Singular 'snippet' for consistency | Douwe Maan | 2017-08-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Use `try` instead of `repond_to?` and a method call | Douwe Maan | 2017-08-18 | 1 | -3/+1 |
| | | | | | | | | |||||
| | | * | | | | | No explicit `to_a` or instance variables needed. | Douwe Maan | 2017-08-18 | 2 | -9/+15 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Fix padding bottom of the discussion note header. | Fatih Acet | 2017-08-18 | 2 | -0/+5 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Fix bottom padding inconsistency of reply form. | Fatih Acet | 2017-08-18 | 2 | -1/+7 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Stop making request for disabled emojis. | Fatih Acet | 2017-08-18 | 1 | -1/+2 |
| | | | | | | | | |||||
| | | * | | | | | IssueNotesRefactor: Move edit button out the dropdown. | Fatih Acet | 2017-08-18 | 1 | -39/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix note action buttons spacing. | ||||
| | | * | | | | | Misc tweaks | Douwe Maan | 2017-08-17 | 7 | -21/+18 |
| | | | | | | | | |||||
| | | * | | | | | Prefer polymorphism over `is_a?` | Douwe Maan | 2017-08-17 | 5 | -6/+14 |
| | | | | | | | | |||||
| | | * | | | | | Rename a few attribute suffixes from `_url` to `_path` | Douwe Maan | 2017-08-17 | 21 | -84/+84 |
| | | | | | | | | |||||
| | | * | | | | | Remove cross-references user cannot see from issue discussions JSON | Douwe Maan | 2017-08-17 | 2 | -4/+6 |
| | | | | | | | | |||||
| | | * | | | | | Remove view=full_data from NotesController | Douwe Maan | 2017-08-17 | 7 | -20/+5 |
| | | | | | | | | |||||
| | | * | | | | | Return null attachment when there is none | Douwe Maan | 2017-08-17 | 2 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'master' into issue-discussions-refactor | Douwe Maan | 2017-08-17 | 501 | -3426/+5930 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json # spec/support/features/reportable_note_shared_examples.rb | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |