summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* Fixed issue with expand diff not initializing resolve buttonsPhil Hughes2016-08-042-5/+7
* Jumps between discussions on the changes tabPhil Hughes2016-08-042-25/+34
* Comment & resolve button no longer looks for can-resolve attributePhil Hughes2016-08-0413-87/+107
* Merge branch 'master' into diff-line-comment-vuejsDouwe Maan2016-08-03298-2652/+5823
|\
| * Merge branch 'use-raw-diffs-for-merge-request-diffs' into 'master' Douwe Maan2016-08-034-14/+14
| |\
| | * change the API on the merge_request_diff model from diffs -> raw_diffsuse-raw-diffs-for-merge-request-diffsPaco Guzman2016-08-034-14/+14
| |/
| * Merge branch 'fix/speed-up-commit-repo-changes' into 'master' Douwe Maan2016-08-036-6/+7
| |\
| | * Use commit deltas when counting files in IrkerWorkerfix/speed-up-commit-repo-changesAhmad Sherif2016-08-032-2/+2
| | * Use only deltas in diffs when scanning the last commit for changes in the ava...Stan Hu2016-08-032-2/+2
| | * Speed up Commit#repo_changesAhmad Sherif2016-08-034-4/+5
| * | Merge branch 'update-gitlab-shell-in-tests' into 'master' Robert Speicher2016-08-031-2/+8
| |\ \ | | |/ | |/|
| | * Update the gitlab-shell version in the tmp/tests directory to the right versionupdate-gitlab-shell-in-testsStan Hu2016-08-031-2/+8
| * | Merge branch '20034-safe-diffs' into 'master' Douwe Maan2016-08-0352-143/+512
| |\ \
| | * | Make Compare#diffs diff_options a regular argumentDouwe Maan2016-08-035-6/+6
| | * | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-0335-130/+208
| | * | Introduce Compare model in the codebase.Paco Guzman2016-08-0322-75/+118
| | * | Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-0331-175/+259
| | * | Cache highlighted diff lines for merge requestsPaco Guzman2016-08-0329-57/+221
| * | | Merge branch 'add-docker-debugging-docs' into 'master' Achilleas Pipinellis2016-08-033-0/+145
| |\ \ \
| | * | | Small refactor on Registry troubleshootingAchilleas Pipinellis2016-08-031-26/+23
| | * | | Grammar improvementsadd-docker-debugging-docsStan Hu2016-08-021-4/+4
| | * | | Add a note about setting up an insecure registryStan Hu2016-08-021-4/+9
| | * | | Add guide for debugging issues with the Docker container registryStan Hu2016-08-023-0/+143
| * | | | Merge branch 'fix-filter-input-alignment' into 'master' Fatih Acet2016-08-032-2/+1
| |\ \ \ \
| | * | | | Fix filter input alignmentClement Ho2016-08-022-2/+1
| * | | | | Merge branch 'doc-markdown-move' into 'master' Achilleas Pipinellis2016-08-035-1/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Move markdown doc to the right locationAchilleas Pipinellis2016-08-035-1/+2
| |/ / / /
| * | | | Merge branch 'discussion-reply-button-performance' into 'master' Jacob Schatz2016-08-033-3/+4
| |\ \ \ \
| | * | | | Add changelog itemdiscussion-reply-button-performanceDouwe Maan2016-08-011-0/+1
| | * | | | Remove delay when hitting Reply... button on page with a lot of discussionsDouwe Maan2016-08-012-3/+3
| * | | | | Merge branch 'convert-trans-bg-to-css' into 'master' Jacob Schatz2016-08-033-1/+5
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Convert image diff background image to CSSClement Ho2016-08-013-1/+5
| * | | | | Merge branch '18866-add-simple-identifier-to-public-ssh-keys' into 'master' Douwe Maan2016-08-024-5/+8
| |\ \ \ \ \
| | * | | | | Tidy the key spec and fix failing user specKeith Pope2016-08-022-2/+2
| | * | | | | Add simple identifier to public SSH keysKeith Pope2016-08-023-4/+7
| * | | | | | Merge branch 'rs-external-issue-tracker-redirect' into 'master' Douwe Maan2016-08-027-148/+65
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Remove `url_for_new_issue` helperrs-external-issue-tracker-redirectRobert Speicher2016-08-015-66/+24
| | * | | | | Redirect to external issue tracker from `/issues`Robert Speicher2016-08-016-86/+45
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'convert-switch-icon-to-font' into 'master' Dmitriy Zaporozhets2016-08-024-3/+2
| |\ \ \ \ \
| | * | | | | Convert switch icon into icon fontClement Ho2016-08-014-3/+2
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'job/update-workflow-links' into 'master' Stan Hu2016-08-022-0/+4
| |\ \ \ \ \
| | * | | | | link the engineering workflow document from process and contributingjob/update-workflow-linksJob van der Voort2016-08-022-0/+4
| * | | | | | Merge branch 'branches-ending-with-json' into 'master' Douwe Maan2016-08-027-10/+60
| |\ \ \ \ \ \
View Lorry Controller Status