summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix failling spec/features/task_lists_spec.rb due to wrong login helperssh-fix-js-task-list-failureStan Hu2017-09-031-2/+2
* Update CHANGELOG.md for 9.5.3Jose Ivan Vargas2017-09-0317-80/+18
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJose Ivan Vargas2017-09-03339-1844/+9459
|\
| * Merge branch 'issue-discussions-refactor' into 'master'Jacob Schatz2017-09-02137-455/+5457
| |\
| | * Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-31140-626/+1100
| | |\
| | * \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-31133-551/+1492
| | |\ \
| | * | | Fix specsDouwe Maan2017-08-304-9/+16
| | * | | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-30521-3706/+8420
| | |\ \ \
| | * | | | IssueNotesRefactor: Fix broken specs.Fatih Acet2017-08-292-1/+2
| | * | | | IssueNotesRefactor: Fix quick submit spec.Fatih Acet2017-08-252-1/+2
| | * | | | Revert "Update yarn.lock"Douwe Maan2017-08-231-19/+168
| | * | | | IssueNotesRefactor: Hide note reply form when submitted and show it again if ...Fatih Acet2017-08-231-9/+11
| | * | | | IssueNotesRefactor: Empty textarea while submitting comment and restore conte...Fatih Acet2017-08-231-5/+4
| | * | | | Update yarn.lockDouwe Maan2017-08-231-168/+19
| | * | | | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-23450-4538/+5232
| | |\ \ \ \
| | * | | | | IssueNotesRefactor: Show placeholder note immediately when editing.Fatih Acet2017-08-233-7/+46
| | * | | | | IssueNotesRefactor: Fix eslint errors.Fatih Acet2017-08-233-17/+16
| | * | | | | IssueNotesRefactor: Fix error messages of edit/reply failure for discussions.Fatih Acet2017-08-233-10/+20
| | * | | | | IssueNotesRefactor: Hide placeholders and flash messages before submitting a ...Fatih Acet2017-08-221-0/+3
| | * | | | | IssueNotesRefactor: Support legacy multiple notes for individual_note: true c...Fatih Acet2017-08-221-1/+16
| | * | | | | IssueNotesRefactor: Fix consistent typo.Fatih Acet2017-08-224-5/+5
| | * | | | | IssueNotesRefactor: Trigger change event for Vue to catch programmatically va...Fatih Acet2017-08-211-1/+1
| | * | | | | IssueNotesRefactor: Poll again when commands applied.Fatih Acet2017-08-211-2/+4
| | * | | | | IssueNotesRefactor: Fix GFM rendering after edits come in.Fatih Acet2017-08-211-0/+3
| | * | | | | IssueNotesRefactor: Show Cmd+Enter to comment tooltip.Fatih Acet2017-08-214-12/+15
| | * | | | | IssueNotesRefactor: First comment and then close the issue.Fatih Acet2017-08-211-8/+13
| | * | | | | IssueNotesRefactor: Minor naming change to improve readability.Fatih Acet2017-08-212-4/+4
| | * | | | | IssueNotesRefactor: Reenable button after failed submit attempt.Fatih Acet2017-08-213-5/+9
| | * | | | | IssueNotesRefactor: Fix flash container positioning.Fatih Acet2017-08-191-1/+1
| | * | | | | Fix empty markdown render request.Fatih Acet2017-08-181-25/+29
| | * | | | | IssueNotesRefactor: Prevent anon user to try to add award.Fatih Acet2017-08-184-3/+8
| | * | | | | IssueNotesRefactor: Don’t explicitly check against undefined.Fatih Acet2017-08-181-1/+1
| | * | | | | IssueNotesRefactor: Fix award handler.Fatih Acet2017-08-181-1/+1
| | * | | | | IssueNotesRefactor: Fix edit button and emoji dropdown for anon user.Fatih Acet2017-08-181-3/+6
| | * | | | | IssueNotesRefactor: Support legacy last edited by case.Fatih Acet2017-08-183-9/+11
| | * | | | | IssueNotesRefactor: Fix discussion last updated text.Fatih Acet2017-08-181-3/+21
| | * | | | | Singular 'snippet' for consistencyDouwe Maan2017-08-181-1/+1
| | * | | | | Use `try` instead of `repond_to?` and a method callDouwe Maan2017-08-181-3/+1
| | * | | | | No explicit `to_a` or instance variables needed.Douwe Maan2017-08-182-9/+15
| | * | | | | IssueNotesRefactor: Fix padding bottom of the discussion note header.Fatih Acet2017-08-182-0/+5
| | * | | | | IssueNotesRefactor: Fix bottom padding inconsistency of reply form.Fatih Acet2017-08-182-1/+7
| | * | | | | IssueNotesRefactor: Stop making request for disabled emojis.Fatih Acet2017-08-181-1/+2
| | * | | | | IssueNotesRefactor: Move edit button out the dropdown.Fatih Acet2017-08-181-39/+50
| | * | | | | Misc tweaksDouwe Maan2017-08-177-21/+18
| | * | | | | Prefer polymorphism over `is_a?`Douwe Maan2017-08-175-6/+14
| | * | | | | Rename a few attribute suffixes from `_url` to `_path`Douwe Maan2017-08-1721-84/+84
| | * | | | | Remove cross-references user cannot see from issue discussions JSONDouwe Maan2017-08-172-4/+6
| | * | | | | Remove view=full_data from NotesControllerDouwe Maan2017-08-177-20/+5
| | * | | | | Return null attachment when there is noneDouwe Maan2017-08-172-2/+2
| | * | | | | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-17501-3426/+5930
| | |\ \ \ \ \