summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/Semicolon rubocop style copstyle/enable-semicolon-rubocop-copGrzegorz Bizon2016-06-013-3/+3
* Merge branch '17756-close-btn' into 'master' Jacob Schatz2016-05-312-2/+18
|\
| * New style for close buttons17756-close-btnAnnabel Dunstone2016-05-312-2/+18
* | Merge branch 'upgrade-kaminari' into 'master' Robert Speicher2016-05-319-12/+12
|\ \
| * | Upgrade Kaminari from 0.16.3 to 0.17.0.Connor Shea2016-05-319-12/+12
| |/
* | Merge branch 'rs-create-remote-backup-folder' into 'master' Stan Hu2016-05-311-1/+1
|\ \ | |/ |/|
| * Create the specified remote directory during backuprs-create-remote-backup-folderRobert Speicher2016-05-311-1/+1
* | Merge branch 'refactoring/improve-build-specs' into 'master' Robert Speicher2016-05-311-22/+20
|\ \
| * | Remove redundant factory namespace in build specsrefactoring/improve-build-specsGrzegorz Bizon2016-05-311-22/+20
* | | Merge branch 'feature/improve_wiki_page_events' into 'master' Rémy Coutable2016-05-315-10/+38
|\ \ \ | |_|/ |/| |
| * | Add wiki page events fix to the Changelogfeature/improve_wiki_page_eventsGabriel Mazetto2016-05-311-0/+1
| * | Codestyle changesGabriel Mazetto2016-05-311-2/+2
| * | Fix hook data for Wiki Page eventGabriel Mazetto2016-05-314-10/+37
* | | Merge branch 'remove-dangling-notification-settings' into 'master' Stan Hu2016-05-312-0/+14
|\ \ \
| * | | Remove project notification settings associated with deleted projectsStan Hu2016-05-312-0/+14
| |/ /
* | | Merge branch 'container-registry-token-ttl' into 'master' Douwe Maan2016-05-3111-27/+80
|\ \ \ | |/ / |/| |
| * | Remove update of container_registry_token_expire_delayKamil Trzcinski2016-05-311-3/+0
| * | Fix rubocop offensesKamil Trzcinski2016-05-311-1/+1
| * | Set container_registry_token_expire_delay default to 5Kamil Trzcinski2016-05-312-3/+3
| * | Fix migration informationcontainer-registry-token-ttlKamil Trzcinski2016-05-311-13/+1
| * | Test token expirabilityKamil Trzcinski2016-05-311-0/+15
| * | Fix the use of CurrentSettings in ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-311-2/+7
| * | Update db/schema.rbKamil Trzcinski2016-05-311-24/+25
| * | Add Application Setting to configure Container Registry token expire delay (d...Kamil Trzcinski2016-05-319-3/+50
* | | Merge branch 'doc-upgrade-wrong-old-version' into 'master' Robert Schilling2016-05-310-0/+0
|\ \ \ | |/ / |/| |
| * | Update docs: previous version is 8.7Florian Preinstorfer2016-05-251-1/+1
* | | Merge branch 'patch/wiki_page_events' into 'master' Rémy Coutable2016-05-315-2/+65
|\ \ \ | |_|/ |/| |
| * | Small fixes and added to the changelogpatch/wiki_page_eventsGabriel Mazetto2016-05-302-1/+2
| * | Added documentation to current Wiki Page event webhookGabriel Mazetto2016-05-301-0/+54
| * | Add Admin UI to enable Wiki Page events webhook in projectsGabriel Mazetto2016-05-303-2/+10
* | | Merge branch 'make-container-registry-authentication-service-compatible-with-...Stan Hu2016-05-314-33/+20
|\ \ \
| * | | Make authentication service for Container Registry to be compatible with < Do...make-container-registry-authentication-service-compatible-with-older-dockerKamil Trzcinski2016-05-304-33/+20
* | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-05-301-1/+1
|\ \ \ \
| * | | | Fix typoAurelio Jargas2016-05-271-1/+1
* | | | | Merge branch 'docs-typo-fixes' into 'master' Robert Speicher2016-05-308-15/+15
|\ \ \ \ \
| * | | | | succes -> successChris Spicer2016-05-291-4/+4
| * | | | | errros -> errorsChris Spicer2016-05-291-1/+1
| * | | | | Grammar fixes, simlink -> symlinkChris Spicer2016-05-291-3/+3
| * | | | | occuring -> occurringChris Spicer2016-05-291-1/+1
| * | | | | updtae -> updateChris Spicer2016-05-291-1/+1
| * | | | | Add space after comma, add space between 'beautomatically'Chris Spicer2016-05-291-2/+2
| * | | | | Add space between 'Criticalissue'Chris Spicer2016-05-291-1/+1
| * | | | | commited -> committedChris Spicer2016-05-291-2/+2
* | | | | | Merge branch 'issue_18009' into 'master' Robert Speicher2016-05-302-1/+17
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix 18009: add missing steps in update docsArian Sameni2016-05-302-1/+17
| | |_|/ / | |/| | |
* | | | | Merge branch 'rubocop/enable-space-before-comma-cop' into 'master' Robert Speicher2016-05-303-6/+17
|\ \ \ \ \
| * | | | | Enable Style/SpaceBeforeComma rubocop coprubocop/enable-space-before-comma-copGrzegorz Bizon2016-05-303-6/+17
| | |/ / / | |/| | |
* | | | | Merge branch 'rubocop/enable-performance-times-map-cop' into 'master' Robert Speicher2016-05-302-9/+3
|\ \ \ \ \
| * | | | | Enable Performance/TimesMap Rubocop coprubocop/enable-performance-times-map-copGrzegorz Bizon2016-05-302-9/+3
| |/ / / /
* | | | | Merge branch 'rubocop/enable-negatedif-style-cop' into 'master' Robert Speicher2016-05-306-6/+6
|\ \ \ \ \