summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't load blob or content_commits on Gitlab::Diff::File instance for discuss...14202-dont-need-blobsPaco Guzman2016-08-044-4/+7
* Merge branch 'coffescript_docs_migration' into 'master' Rémy Coutable2016-08-042-3/+5
|\
| * Remove CHANGELOG and fix typoRémy Coutable2016-08-042-3/+2
| * Update docs for CoffeeScript migrationcoffescript_docs_migrationJacob Schatz2016-07-221-0/+1
| * Update docs for CoffeeScript -> JavaScript.Jacob Schatz2016-07-222-3/+5
* | Merge branch '20491-remove-unnecessary-index_projects_on_builds_enabled-index...Yorick Peterse2016-08-043-2/+11
|\ \
| * | Remove unnecessary index_projects_on_builds_enabled index from the projects t...20491-remove-unnecessary-index_projects_on_builds_enabled-index-from-the-projects-tableAlejandro Rodríguez2016-08-033-2/+11
* | | Merge branch 'devise-deprecations' into 'master' Rémy Coutable2016-08-047-6/+7
|\ \ \
| * | | Remove provider path, replace with dynamic path.devise-deprecationsConnor Shea2016-08-038-12/+7
| * | | Add an oauth provider path helper.Connor Shea2016-08-035-4/+10
* | | | Structure the development documentationSid Sijbrandij2016-08-041-7/+26
* | | | One link to development guides.Sid Sijbrandij2016-08-041-3/+1
* | | | Merge branch 'instrument-gitlab-highlight' into 'master' Rémy Coutable2016-08-042-0/+4
|\ \ \ \
| * | | | Instrument Gitlab::Highlightinstrument-gitlab-highlightYorick Peterse2016-08-032-0/+4
* | | | | Merge branch 'fix/confusing-blocked-user-description' into 'master' Achilleas Pipinellis2016-08-042-5/+4
|\ \ \ \ \
| * | | | | Fix confusing description of a blocked user.Elias Werberich2016-08-022-5/+4
* | | | | | Merge branch 'syntax-highlight-filter-performance' into 'master' Rémy Coutable2016-08-042-8/+19
|\ \ \ \ \ \
| * | | | | | Improve performance of SyntaxHighlightFiltersyntax-highlight-filter-performanceYorick Peterse2016-08-032-8/+19
* | | | | | | Merge branch 'fix/import-error' into 'master' Rémy Coutable2016-08-043-1/+34
|\ \ \ \ \ \ \
| * | | | | | | Fix Import/Export error checking versionsfix/import-errorJames Lopez2016-08-033-1/+34
* | | | | | | | Merge branch 'autolink-filter-text-parse' into 'master' Rémy Coutable2016-08-042-6/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve AutolinkFilter#text_parse performanceautolink-filter-text-parseYorick Peterse2016-08-032-6/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'remove-unused-images' into 'master' Rémy Coutable2016-08-0411-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unused imagesClement Ho2016-08-0311-0/+1
* | | | | | | | | Merge branch '20510-fix-dont-pass-a-local-variable-called-to-a-partial' into ...Rémy Coutable2016-08-043-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix Mystery GuestHerminio Torres2016-08-043-3/+4
* | | | | | | | | | Merge branch 'fix_slack_notification_build' into 'master' Stan Hu2016-08-041-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Don't setup DB for slack notification buildRuben Davila2016-08-041-0/+3
* | | | | | | | | | Merge branch 'fix-project-destroy-skip-repo' into 'master' Robert Speicher2016-08-043-1/+26
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix skip_repo parameter being ignored when destroying a namespaceStan Hu2016-08-033-1/+26
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
View Lorry Controller Status