summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Statisfy Robertcop and Seancopdm-outdated-diff-linkDouwe Maan2017-04-112-10/+4
|
* Add specsDouwe Maan2017-04-105-2/+98
|
* Fix specsDouwe Maan2017-04-093-5/+8
|
* Some code tweaksDouwe Maan2017-04-088-18/+21
|
* Fix views after rebaseDouwe Maan2017-04-082-3/+5
|
* Fix find_by_diff_refsDouwe Maan2017-04-081-1/+1
|
* Fix specs and make tweaksDouwe Maan2017-04-087-39/+50
|
* Change discussion headline to 'a now outdated portion of the diff'Douwe Maan2017-04-081-4/+3
|
* Add link to diff header tooDouwe Maan2017-04-082-14/+16
|
* Cache MR diffs by diff refsDouwe Maan2017-04-082-1/+11
|
* Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-0815-39/+63
|
* Merge branch 'new-resolvable-discussion' into 'master' Douwe Maan2017-04-08140-2225/+4037
|\ | | | | | | | | | | | | Add option to start a new resolvable discussion in an MR Closes #24378 See merge request !7527
| * Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-0738-697/+881
| |\
| * | Fix specsDouwe Maan2017-04-072-2/+2
| | |
| * | alfredo review changesLuke "Jared" Bennett2017-04-071-1/+1
| | |
| * | Revert yarn.lock changesLuke "Jared" Bennett2017-04-072-273/+2055
| | |
| * | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-07123-480/+1883
| |\ \
| * | | Rever yarn.lock changesLuke "Jared" Bennett2017-04-071-2075/+276
| | | |
| * | | Review changesLuke "Jared" Bennett2017-04-074-9/+34
| | | |
| * | | Fix firefox overflow css bugLuke "Jared" Bennett2017-04-071-0/+1
| | | |
| * | | Fix bug where commit comment would not show up in the right discussion on ↵Douwe Maan2017-04-072-11/+11
| | | | | | | | | | | | | | | | the MR page
| * | | Fix creating discussion when diff view is set to parallelDouwe Maan2017-04-072-27/+20
| | | |
| * | | Fix view specDouwe Maan2017-04-071-2/+2
| | | |
| * | | Update schema.rbDouwe Maan2017-04-071-1/+1
| | | |
| * | | Add link to list itemsLuke "Jared" Bennett2017-04-072-15/+28
| | | |
| * | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-0767-309/+1225
| |\ \ \
| * | | | Added variable button fixLuke "Jared" Bennett2017-04-073-20/+38
| | | | |
| * | | | Fixed issue button state bugLuke "Jared" Bennett2017-04-075-80/+121
| | | | |
| * | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-07229-1046/+1847
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into update-droplab-to-webpack-versionupdate-droplab-to-webpack-versionLuke "Jared" Bennett2017-04-07466-2918/+9189
| | |\ \ \ \
| * | | | | | Fixed bugs and added testsLuke "Jared" Bennett2017-04-076-15/+33
| | | | | | |
| * | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-074-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Renamed spec filesLuke "Jared" Bennett2017-04-074-0/+0
| | | | | | |
| * | | | | | Finish up feature specLuke "Jared" Bennett2017-04-074-65/+63
| | | | | | |
| * | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-062-10/+80
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Update inputsetterLuke "Jared" Bennett2017-04-062-10/+80
| | | | | | |
| * | | | | | Further fixes for feature specLuke "Jared" Bennett2017-04-061-4/+6
| | | | | | |
| * | | | | | Update schema.rb versionDouwe Maan2017-04-061-1/+1
| | | | | | |
| * | | | | | Merge branch 'new-resolvable-discussion' of gitlab.com:gitlab-org/gitlab-ce ↵Luke "Jared" Bennett2017-04-06272-1879/+7349
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into new-resolvable-discussion
| | * \ \ \ \ \ Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-06272-1879/+7349
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml
| * | | | | | | | Further fixes for feature specLuke "Jared" Bennett2017-04-061-25/+30
| |/ / / / / / /
| * | | | | | | Merge branch 'new-resolvable-discussion' of gitlab.com:gitlab-org/gitlab-ce ↵Luke "Jared" Bennett2017-04-0618-69/+107
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into new-resolvable-discussion
| | * | | | | | | Refactor resolvability checks based on typeDouwe Maan2017-04-0617-67/+107
| | | | | | | | |
| | * | | | | | | Remove unnecesary styleAlfredo Sumaran2017-04-061-2/+0
| | | | | | | | |
| * | | | | | | | Fix feature specs, still some to be doneLuke "Jared" Bennett2017-04-061-13/+21
| |/ / / / / / /
| * | | | | | | Add feature specsLuke "Jared" Bennett2017-04-062-4/+246
| | | | | | | |
| * | | | | | | Correct dropdown widthLuke "Jared" Bennett2017-04-061-1/+1
| | | | | | | |
| * | | | | | | Update unit testsLuke "Jared" Bennett2017-04-064-36/+81
| | | | | | | |
| * | | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-06249-772/+2863
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fixed error handlingLuke "Jared" Bennett2017-04-065-15/+23
| | | | | | | |
View Lorry Controller Status