summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Small refactor in Redis class and improved specsGabriel Mazetto2016-08-064-9/+16
* Small refactor and a few documentation fixesGabriel Mazetto2016-08-044-7/+7
* Added Redis sentinel support to the CHANGELOGGabriel Mazetto2016-08-041-0/+1
* Updated documentations for Redis Sentinel experimental supportGabriel Mazetto2016-08-041-23/+28
* Refactor Redis HA docs to also include SentinelAchilleas Pipinellis2016-08-041-102/+245
* Added Redis Sentinel support documentationGabriel Mazetto2016-08-042-1/+108
* Synced mail_room.yml with the one in omnibusGabriel Mazetto2016-08-041-0/+4
* Few minor fixes to Redis params order and commented out sentinel configGabriel Mazetto2016-08-043-23/+23
* Fixed MailRoom specs and make sure it works with new resque.yml formatGabriel Mazetto2016-08-043-25/+28
* Fixed specs for Gitlab::Redis and code for Redis Sentinel supportGabriel Mazetto2016-08-044-30/+27
* Reverted resque.yml -> redis.yml renamingGabriel Mazetto2016-08-041-1/+1
* Make sidekiq get config settings from Gitlab::RedisConfigGabriel Mazetto2016-08-041-8/+6
* Specs for RedisConfigGabriel Mazetto2016-08-046-1/+125
* Deduplicated resque.yml loading from several placesGabriel Mazetto2016-08-047-65/+159
* Merge branch '20609-fix-protected-branch-access-levels-migration' into 'master' Douwe Maan2016-08-042-4/+4
|\
| * Migrate protected branch access levels to match constants in `Gitlab::Access`20609-fix-protected-branch-access-levels-migrationTimothy Andrew2016-08-042-4/+4
* | Merge branch 'fix-add-column-with-default-null' into 'master' Douwe Maan2016-08-042-2/+2
|\ \
| * | Fix `#down` for two protected branches-related migrations.fix-add-column-with-default-nullTimothy Andrew2016-08-042-2/+2
| |/
* | Merge branch 'doc-artifacts-refactor' into 'master' Achilleas Pipinellis2016-08-0414-176/+222
|\ \
| * | Fix relative URLdoc-artifacts-refactorAchilleas Pipinellis2016-08-041-2/+2
| * | Refactor build artifacts documentationAchilleas Pipinellis2016-08-0414-176/+222
* | | Update CHANGELOG for 8.10.4Rémy Coutable2016-08-041-4/+6
* | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-08-042-1/+14
|\ \ \
| * \ \ Merge branch '20527-fork-commits-have-impact-on-original-project' into 'master' Rémy Coutable2016-08-042-1/+14
| |\ \ \
| | * | | Don’t close issues on original project from a forkPaco Guzman2016-08-042-1/+14
* | | | | Merge branch 'fixtures-improvements' into 'master' Kamil Trzciński2016-08-041-24/+21
|\ \ \ \ \
| * | | | | Improve CI fixturesfixtures-improvementsZ.J. van de Weg2016-08-031-24/+21
* | | | | | Merge branch '20512-fix-rename-add-users-into-project-to-add-users-to-project...Rémy Coutable2016-08-046-14/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix Rename `add_users_into_project` and `projects_ids`Herminio Torres2016-08-046-14/+15
* | | | | | Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-049-15/+106
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix specJames Lopez2016-08-041-1/+1
| * | | | | using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-049-15/+106
* | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status