summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixes Notes::BaseService inheritanceosw-comment-on-any-diff-line-cache-fixOswaldo Ferreira2018-10-302-2/+2
* Refactor @unfold flagOswaldo Ferreira2018-10-305-71/+86
* Move unfold_required? back to pvtOswaldo Ferreira2018-10-301-2/+2
* Adjusts diff HL cachingOswaldo Ferreira2018-10-305-14/+96
* Use highlighting cache when commenting in unfolded diffsOswaldo Ferreira2018-10-308-9/+36
* Update commentOswaldo Ferreira2018-10-301-1/+2
* Add comments to the classOswaldo Ferreira2018-10-301-0/+2
* Rename expander to LinesUnfolderOswaldo Ferreira2018-10-303-9/+8
* Do not unfold lines on invalid position when importingOswaldo Ferreira2018-10-301-0/+2
* Comment on any expanded diff line on MRsOswaldo Ferreira2018-10-3016-52/+1154
* Merge branch '53227-empty-list' into 'master'Phil Hughes2018-10-305-24/+111
|\
| * Runs prettier on changed files53227-empty-listFilipa Lacerda2018-10-301-1/+1
| * Prevents review app to render an empty dropdown.Filipa Lacerda2018-10-305-24/+111
* | Merge branch 'tc-index-lfs-objects-file-store' into 'master'Douglas Barbosa Alexandre2018-10-305-21/+25
|\ \
| * | Enhance performance of counting local LFS objectstc-index-lfs-objects-file-storeToon Claes2018-10-305-21/+25
* | | Merge branch 'winh-pipeline-actions-dynamic-timer' into 'master'Filipa Lacerda2018-10-303-8/+13
|\ \ \
| * | | Add dynamic timer for delayed jobs in pipelines listwinh-pipeline-actions-dynamic-timerWinnie Hellmann2018-10-293-8/+13
* | | | Merge branch 'backport-ee-7203-sticky-logs-topbar' into 'master'Filipa Lacerda2018-10-303-74/+100
|\ \ \ \
| * | | | Backport ee 7203 sticky logs topbarSimon Knox2018-10-303-74/+100
|/ / / /
* | | | Merge branch 'mr-diff-discussion-deletion' into 'master'Filipa Lacerda2018-10-303-8/+5
|\ \ \ \
| * | | | Fixes diff discussions not being fully removedmr-diff-discussion-deletionPhil Hughes2018-10-303-8/+5
* | | | | Merge branch 'sh-fix-issue-53153' into 'master'Sean McGivern2018-10-303-1/+71
|\ \ \ \ \
| * | | | | Fix extra merge request versions created from forked merge requestssh-fix-issue-53153Stan Hu2018-10-293-1/+71
* | | | | | Merge branch 'ml-qa-squash-fix' into 'master'Sean McGivern2018-10-301-0/+1
|\ \ \ \ \ \
| * | | | | | Wait for push before checking for new commitml-qa-squash-fixMark Lapierre2018-10-261-0/+1
* | | | | | | Merge branch 'fix-53298' into 'master'Dmitriy Zaporozhets2018-10-302-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Adding changelog entryAmit Rathi2018-10-301-0/+5
| * | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceAmit Rathi2018-10-3026-341/+301
| |\ \ \ \ \ \ \
| * | | | | | | | Fix #53298: JupyterHub to restarts should work without errorsAmit Rathi2018-10-301-1/+1
* | | | | | | | | Merge branch 'mlapierre-master-patch-47853' into 'master'Marin Jankovski2018-10-301-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix Review Apps testing guidemlapierre-master-patch-47853Mark Lapierre2018-10-291-3/+3
* | | | | | | | | Merge branch 'rename-secret-variables-1' into 'master'Grzegorz Bizon2018-10-3025-64/+69
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Renaming Secret Variables in the codebaseMarcel Amirault2018-10-3025-64/+69
|/ / / / / / / / /
* | | | | | | | | Merge branch 'qa-filter-comments-in-issues' into 'master'Grzegorz Bizon2018-10-303-15/+55
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Adding tests for filtering activities/comments in issuesRamya Authappan2018-10-303-15/+55
|/ / / / / / / /
* | | | | | | | Merge remote-tracking branch 'origin/master' into dev-masterJan Provaznik2018-10-3023-59/+66
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'bw-fix-spec-in-merge' into 'master'Stan Hu2018-10-301-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix problem with spec that showed up in EE mergeBrett Walker2018-10-291-1/+1
| * | | | | | | | | Merge branch 'docs-add_deprecation_notice_for_renamed_licensed_feature-ce' in...Evan Read2018-10-301-0/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Add deprecation notice for renamed licensed featuredocs-add_deprecation_notice_for_renamed_licensed_feature-ceOlivier Gonzalez2018-10-241-0/+6
| * | | | | | | | | Merge branch 'patch-31' into 'master'Evan Read2018-10-301-0/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Added a note about machine typesMark Veenstra2018-10-301-0/+3
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'update-gitlab-ui' into 'master'Mike Greiling2018-10-2916-51/+51
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update gitlab-ui to 1.9.0Clement Ho2018-10-2916-51/+51
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '53270-remove-mousetrap-rails' into 'master'Mike Greiling2018-10-294-7/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove mousetrap-rails gemTakuya Noguchi2018-10-284-7/+5
* | | | | | | | | | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-29406-3204/+6889
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'Douwe Maan2018-10-2925-47/+55
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | * | | | | | | | | Revert _diffs.html.hamlblackst0ne-update-push-new-merge-request-urlblackst0ne2018-10-271-1/+0
| | * | | | | | | | | Fix specsblackst0ne2018-10-268-16/+17