summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix changelog and mergefix/import-url-uri-issueJames Lopez2016-05-232-2/+4
* fix merge conflictsJames Lopez2016-05-23458-929/+8922
|\
| * Merge branch 'fix/application-settings-error-default-value' into 'master' Stan Hu2016-05-232-1/+4
| |\
| | * Serialize application setting as Array by defaultfix/application-settings-error-default-valueGrzegorz Bizon2016-05-222-1/+4
| |/
| * Update CHANGELOG for 8.8.1. Again.Robert Speicher2016-05-221-1/+0
| * Update CHANGELOG for 8.8.1Robert Speicher2016-05-221-2/+4
| * Merge branch 'fix-y2k17-problem' into 'master' Robert Speicher2016-05-233-12/+12
| |\
| | * Fix some specs which would have broken in 2017 to not break anymore by using ...Connor Shea2016-05-223-12/+12
| * | Merge branch 'registry_admin_docs' into 'master' Achilleas Pipinellis2016-05-234-4/+433
| |\ \ | | |/ | |/|
| | * Fixes suggested by KamilAchilleas Pipinellis2016-05-221-23/+9
| | * Refactor storage location sectionAchilleas Pipinellis2016-05-221-24/+34
| | * Add note about port needed in NGINX configAchilleas Pipinellis2016-05-221-0/+2
| | * Fix remaining docs on enabling/disabling RegistryAchilleas Pipinellis2016-05-221-33/+34
| | * Fix Registry docs now that it is not enabled be defaultregistry_admin_docsAchilleas Pipinellis2016-05-221-16/+27
| | * Clarify how the Registry is enabled in OmnibusAchilleas Pipinellis2016-05-221-7/+10
| | * Major overhaul of the Registry admin docsAchilleas Pipinellis2016-05-221-107/+187
| | * Add NGINX config file for RegistryAchilleas Pipinellis2016-05-221-0/+51
| | * Add proper config values for Registry in gitlab.ymlAchilleas Pipinellis2016-05-221-4/+4
| | * Add link to container registryAchilleas Pipinellis2016-05-221-0/+1
| | * Refactor container docsAchilleas Pipinellis2016-05-221-32/+147
| | * Add assumptions section and refactor domain configurationAchilleas Pipinellis2016-05-221-17/+39
| | * Rearrange configuration partsAchilleas Pipinellis2016-05-221-38/+38
| | * Rearrange headingsAchilleas Pipinellis2016-05-221-11/+31
| | * Initial docker container registry configuration docs.Marin Jankovski2016-05-221-0/+127
| * | Merge branch 'fix-access-to-pipelines-for-anonymous' into 'master' Robert Speicher2016-05-235-1/+14
| |\ \
| | * | Move Changelog for pipeline fix to valid versionfix-access-to-pipelines-for-anonymousGrzegorz Bizon2016-05-231-1/+1
| | * | Allow anonymous user to access pipelinesKamil Trzcinski2016-05-235-1/+14
| |/ /
| * | Merge branch 'fix-ci-login-to-registry' into 'master' Stan Hu2016-05-225-5/+6
| |\ \
| | * | Move registry fix Changelog entry to valid versionfix-ci-login-to-registryGrzegorz Bizon2016-05-231-1/+1
| | * | Fix the CI login to Container Registry (the gitlab-ci-token user)Kamil Trzcinski2016-05-235-5/+6
| * | | Merge branch 'upgrade-activerecord-session-store' into 'master' Robert Speicher2016-05-222-6/+8
| |\ \ \ | | |/ / | |/| |
| | * | Upgrade activerecord-sessionstore from 0.1.2 to 1.0.0.Connor Shea2016-05-192-6/+8
| * | | Merge branch 'fix/migration-helpers-mysql-compatibility' into 'master' Stan Hu2016-05-223-8/+23
| |\ \ \ | | |_|/ | |/| |
| | * | Add Changelog entry for MySQL compatibility fixfix/migration-helpers-mysql-compatibilityGrzegorz Bizon2016-05-221-0/+3
| | * | Extend comment for migrations helper MySQL fixGrzegorz Bizon2016-05-221-1/+8
| | * | Add MySQL compatibility fix in migration helpersGrzegorz Bizon2016-05-221-1/+2
| | * | Add specs for migration helpers and boolean valuesGrzegorz Bizon2016-05-221-0/+6
| | * | Test migration helpers using a migration classGrzegorz Bizon2016-05-221-7/+5
| |/ /
| * | Merge branch 'remove_email_in_group_doc' into 'master' Jeroen van Baarsen2016-05-221-2/+0
| |\ \
| | * | fix group members api doc: remove emialSanster2016-05-211-2/+0
| * | | Merge branch 'health_check_docs' into 'master' Achilleas Pipinellis2016-05-223-0/+67
| |\ \ \
| | * | | Copyedit health check docshealth_check_docsAchilleas Pipinellis2016-05-221-7/+16
| | * | | Fix grammar in health_check.md DJ Mountney2016-05-201-1/+1
| | * | | Fix broken pingdom link in the health_check docsDJ Mountney2016-05-181-1/+1
| | * | | Add health check feature documentationDJ Mountney2016-05-183-0/+58
| * | | | Merge branch 'fix-docker-registry-integration' into 'master' Yorick Peterse2016-05-214-3/+15
| |\ \ \ \
| | * | | | Update CHANGELOGfix-docker-registry-integrationKamil Trzcinski2016-05-211-0/+1
| | * | | | Fix container deletion permission issueKamil Trzcinski2016-05-203-3/+14
| * | | | | Merge branch 'gitignore-readme' into 'master' Jeroen van Baarsen2016-05-211-0/+14
| |\ \ \ \ \
| | * | | | | Add README for updating .gitignore templatesgitignore-readmeStan Hu2016-05-201-0/+14