Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '20512-fix-rename-add-users-into-project-to-add-users-to-project... | Rémy Coutable | 2016-08-04 | 6 | -14/+15 |
|\ | |||||
| * | Fix Rename `add_users_into_project` and `projects_ids` | Herminio Torres | 2016-08-04 | 6 | -14/+15 |
* | | Merge branch 'fix/ha-mode-import-issue' into 'master' | Rémy Coutable | 2016-08-04 | 9 | -15/+106 |
|\ \ | |/ |/| | |||||
| * | fix spec | James Lopez | 2016-08-04 | 1 | -1/+1 |
| * | using shared path for project import uploads and refactored gitlab remove exp... | James Lopez | 2016-08-04 | 9 | -15/+106 |
* | | Merge branch 'coffescript_docs_migration' into 'master' | Rémy Coutable | 2016-08-04 | 2 | -3/+5 |
|\ \ | |||||
| * | | Remove CHANGELOG and fix typo | Rémy Coutable | 2016-08-04 | 2 | -3/+2 |
| * | | Update docs for CoffeeScript migrationcoffescript_docs_migration | Jacob Schatz | 2016-07-22 | 1 | -0/+1 |
| * | | Update docs for CoffeeScript -> JavaScript. | Jacob Schatz | 2016-07-22 | 2 | -3/+5 |
* | | | Merge branch '20491-remove-unnecessary-index_projects_on_builds_enabled-index... | Yorick Peterse | 2016-08-04 | 3 | -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-table | Alejandro Rodríguez | 2016-08-03 | 3 | -2/+11 |
* | | | | Merge branch 'devise-deprecations' into 'master' | Rémy Coutable | 2016-08-04 | 7 | -6/+7 |
|\ \ \ \ | |||||
| * | | | | Remove provider path, replace with dynamic path.devise-deprecations | Connor Shea | 2016-08-03 | 8 | -12/+7 |
| * | | | | Add an oauth provider path helper. | Connor Shea | 2016-08-03 | 5 | -4/+10 |
* | | | | | Structure the development documentation | Sid Sijbrandij | 2016-08-04 | 1 | -7/+26 |
* | | | | | One link to development guides. | Sid Sijbrandij | 2016-08-04 | 1 | -3/+1 |
* | | | | | Merge branch 'instrument-gitlab-highlight' into 'master' | Rémy Coutable | 2016-08-04 | 2 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Instrument Gitlab::Highlightinstrument-gitlab-highlight | Yorick Peterse | 2016-08-03 | 2 | -0/+4 |
* | | | | | | Merge branch 'fix/confusing-blocked-user-description' into 'master' | Achilleas Pipinellis | 2016-08-04 | 2 | -5/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix confusing description of a blocked user. | Elias Werberich | 2016-08-02 | 2 | -5/+4 |
* | | | | | | | Merge branch 'syntax-highlight-filter-performance' into 'master' | Rémy Coutable | 2016-08-04 | 2 | -8/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Improve performance of SyntaxHighlightFiltersyntax-highlight-filter-performance | Yorick Peterse | 2016-08-03 | 2 | -8/+19 |
* | | | | | | | | Merge branch 'fix/import-error' into 'master' | Rémy Coutable | 2016-08-04 | 3 | -1/+34 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix Import/Export error checking versionsfix/import-error | James Lopez | 2016-08-03 | 3 | -1/+34 |
* | | | | | | | | | Merge branch 'autolink-filter-text-parse' into 'master' | Rémy Coutable | 2016-08-04 | 2 | -6/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Improve AutolinkFilter#text_parse performanceautolink-filter-text-parse | Yorick Peterse | 2016-08-03 | 2 | -6/+10 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'remove-unused-images' into 'master' | Rémy Coutable | 2016-08-04 | 11 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove unused images | Clement Ho | 2016-08-03 | 11 | -0/+1 |
* | | | | | | | | | | Merge branch '20510-fix-dont-pass-a-local-variable-called-to-a-partial' into ... | Rémy Coutable | 2016-08-04 | 3 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix Mystery Guest | Herminio Torres | 2016-08-04 | 3 | -3/+4 |
* | | | | | | | | | | | Merge branch 'fix_slack_notification_build' into 'master' | Stan Hu | 2016-08-04 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Don't setup DB for slack notification build | Ruben Davila | 2016-08-04 | 1 | -0/+3 |
* | | | | | | | | | | | Merge branch 'fix-project-destroy-skip-repo' into 'master' | Robert Speicher | 2016-08-04 | 3 | -1/+26 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix skip_repo parameter being ignored when destroying a namespace | Stan Hu | 2016-08-03 | 3 | -1/+26 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'use-raw-diffs-for-merge-request-diffs' into 'master' | Douwe Maan | 2016-08-03 | 4 | -14/+14 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | change the API on the merge_request_diff model from diffs -> raw_diffsuse-raw-diffs-for-merge-request-diffs | Paco Guzman | 2016-08-03 | 4 | -14/+14 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'fix/speed-up-commit-repo-changes' into 'master' | Douwe Maan | 2016-08-03 | 6 | -6/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use commit deltas when counting files in IrkerWorkerfix/speed-up-commit-repo-changes | Ahmad Sherif | 2016-08-03 | 2 | -2/+2 |
| * | | | | | | | | | Use only deltas in diffs when scanning the last commit for changes in the ava... | Stan Hu | 2016-08-03 | 2 | -2/+2 |
| * | | | | | | | | | Speed up Commit#repo_changes | Ahmad Sherif | 2016-08-03 | 4 | -4/+5 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'update-gitlab-shell-in-tests' into 'master' | Robert Speicher | 2016-08-03 | 1 | -2/+8 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Update the gitlab-shell version in the tmp/tests directory to the right versionupdate-gitlab-shell-in-tests | Stan Hu | 2016-08-03 | 1 | -2/+8 |
* | | | | | | | | | Merge branch '20034-safe-diffs' into 'master' | Douwe Maan | 2016-08-03 | 52 | -143/+512 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Make Compare#diffs diff_options a regular argument | Douwe Maan | 2016-08-03 | 5 | -6/+6 |
| * | | | | | | | | switch from diff_file_collection to diffs20034-safe-diffs | Paco Guzman | 2016-08-03 | 35 | -130/+208 |
| * | | | | | | | | Introduce Compare model in the codebase. | Paco Guzman | 2016-08-03 | 22 | -75/+118 |
| * | | | | | | | | Move to Gitlab::Diff::FileCollection | Paco Guzman | 2016-08-03 | 31 | -175/+259 |
| * | | | | | | | | Cache highlighted diff lines for merge requests | Paco Guzman | 2016-08-03 | 29 | -57/+221 |
* | | | | | | | | | Merge branch 'add-docker-debugging-docs' into 'master' | Achilleas Pipinellis | 2016-08-03 | 3 | -0/+145 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Small refactor on Registry troubleshooting | Achilleas Pipinellis | 2016-08-03 | 1 | -26/+23 |