summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ensure that we never assume old_blob or new_blob are nil44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binarySean McGivern2018-03-163-18/+38
* Merge branch 'jej/commit-api-tracks-lfs' into 'master'Dmitriy Zaporozhets2018-03-1610-64/+270
|\
| * Extract constant for LfsPointerFile::VERSION_LINEJames Edwards-Jones2018-03-164-7/+10
| * Avoid printing data for LfsPointerFile#inspectjej/commit-api-tracks-lfsJames Edwards-Jones2018-03-151-0/+4
| * Use correct encoding with Lfs::FileTransfromerJames Edwards-Jones2018-03-154-19/+68
| * Lfs::FileTranformer caches .gitattributes parserJames Edwards-Jones2018-03-152-3/+8
| * Avoid failed integrity check by linking LfsObjectProjects soonerJames Edwards-Jones2018-03-154-67/+30
| * Multi-file upload and Commit API obey LFS filtersJames Edwards-Jones2018-03-156-11/+193
| * Rename Lfs::FileModificationHandler to Lfs::FileTransformerJames Edwards-Jones2018-03-152-2/+2
* | Merge branch 'docs-refactor-dev-guides' into 'master'44320-add-security-details-in-a-table-to-contributing-manualAchilleas Pipinellis2018-03-162-296/+316
|\ \
| * | Docs: refactor doc general guidelines and style guidelinesMarcia Ramos2018-03-162-296/+316
|/ /
* | Merge branch 'docs-update_code_quality_example' into 'master'Achilleas Pipinellis2018-03-161-7/+15
|\ \
| * | Update Code Quality example documentationdocs-update_code_quality_exampleOlivier Gonzalez2018-03-161-7/+15
* | | Merge branch 'docs-44273-fix-ce-install-link' into 'master'Achilleas Pipinellis2018-03-161-1/+1
|\ \ \
| * | | Fix CE install link for downgrade docsMark Fletcher2018-03-141-1/+1
* | | | Merge branch 'fix-check-task-docs' into 'master'Sean McGivern2018-03-161-3/+3
|\ \ \ \
| * | | | Add version available info to integrity check rake task docsBalasankar "Balu" C2018-03-161-3/+3
|/ / / /
* | | | Merge branch 'update-flipper' into 'master'Grzegorz Bizon2018-03-162-11/+11
|\ \ \ \
| * | | | Update flipper 0.11.0 -> 0.13.0Pirate Praveen2018-03-132-13/+13
* | | | | Merge branch '44235-update-knapsack-to-1.16.0' into 'master'Grzegorz Bizon2018-03-163-4/+8
|\ \ \ \ \
| * | | | | Update knapsack to 1.16.0Takuya Noguchi2018-03-143-4/+8
* | | | | | Merge branch '43522-technical-debt-service-disabled_title' into 'master'Dmitriy Zaporozhets2018-03-164-19/+0
|\ \ \ \ \ \
| * | | | | | Removed unused `Service#disabled_title` methods43522-technical-debt-service-disabled_titleJames Edwards-Jones2018-03-154-19/+0
* | | | | | | Merge branch 'sh-cache-table-exists' into 'master'Yorick Peterse2018-03-164-1/+23
|\ \ \ \ \ \ \
| * | | | | | | Cache table_exists?('application_settings') to reduce repeated schema reloadssh-cache-table-existsStan Hu2018-03-154-1/+23
* | | | | | | | Merge branch 'sh-cache-column-exists' into 'master'Yorick Peterse2018-03-164-3/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Cache column_exists? for application settingssh-cache-column-existsStan Hu2018-03-154-3/+23
* | | | | | | | Merge branch 'mr-sticky-tabs-perf-bar' into 'master'Filipa Lacerda2018-03-161-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes merge request bar styling when performance bar is visiblemr-sticky-tabs-perf-barPhil Hughes2018-03-151-0/+5
* | | | | | | | | Merge branch 'docs-ee-5017-rename_sast_container_to_container_scanning' into ...Achilleas Pipinellis2018-03-164-60/+64
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename SAST for Docker to Container Scanning in documentation. Refs gitlab-or...docs-ee-5017-rename_sast_container_to_container_scanningOlivier Gonzalez2018-03-154-60/+64
* | | | | | | | | | Merge branch 'revert-feb95ce3' into 'master'Grzegorz Bizon2018-03-162-3/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Revert "Merge branch 'update-httparty' into 'master'"Stan Hu2018-03-162-3/+4
|/ / / / / / / / /
* | | | | | | | | Update CHANGELOG.md for 10.5.5Ian Baum2018-03-156-25/+14
* | | | | | | | | Merge branch 'docs-new-fe-guide-style' into 'master'Jacob Schatz2018-03-152-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename style to style guide in new frontend guideClement Ho2018-03-152-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-import-helper-spec' into 'master'Stan Hu2018-03-151-4/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Fix import helper spec when a previous spec stubs settingsSean McGivern2018-03-151-4/+2
* | | | | | | | | Merge branch 'jivl-realtime-update-adding-file' into 'master'Phil Hughes2018-03-153-0/+52
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Include feature spec for realtime pipelinejivl-realtime-update-adding-fileMayra Cabrera2018-03-141-9/+18
| * | | | | | | | | Add realtime pipeline status component for filesJose Ivan Vargas2018-03-143-0/+43
* | | | | | | | | | Merge branch '44191-reduce-redis-usage-from-merge-request-diffs-caching' into...Stan Hu2018-03-157-18/+57
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Only cache MR diffs for one week44191-reduce-redis-usage-from-merge-request-diffs-cachingSean McGivern2018-03-152-3/+3
| * | | | | | | | | | Only cache highlight results for latest MR diffsSean McGivern2018-03-157-17/+56
* | | | | | | | | | | Merge branch '44306-drop-jquery-rails' into 'master'Phil Hughes2018-03-152-6/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove jquery-rails from GemfileBalasankar "Balu" C2018-03-152-6/+0
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'issue_41724' into 'master'Sean McGivern2018-03-151-0/+103
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add labeled issues seedissue_41724Felipe Artur2018-03-151-0/+103
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'adamco/gitlab-ce-move-issue-command' into 'master'Grzegorz Bizon2018-03-158-1/+254
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add slash command for moving an issueSean McGivern2018-03-158-1/+254