summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't advertise the use of "ci skip" in the CONTRIBUTING guidedont-advertise-ci-skipRémy Coutable2016-06-011-4/+2
* Merge branch 'doc_api_services_jira_amend' into 'master' Rémy Coutable2016-06-011-0/+2
|\
| * Amend jira service api docs [ci skip]Richard Grainger2016-05-311-0/+2
* | Merge branch 'issue_15557' into 'master' Rémy Coutable2016-06-0115-47/+73
|\ \
| * | Add leading comment space copissue_15557Felipe Artur2016-05-3113-53/+52
| * | Fix error 500 when sorting issues by milestone due date and filtering by labelsFelipe Artur2016-05-314-3/+30
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-0130-75/+184
|\ \
| * \ Merge branch 'rs-event-common-has-tooltip' into 'master' Dmitriy Zaporozhets2016-06-011-1/+1
| |\ \
| | * | Add tooltips for common Event feed entriesrs-event-common-has-tooltipRobert Speicher2016-05-301-1/+1
| * | | 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 'data_leak' into 'master' Robert Speicher2016-05-314-4/+40
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Confidential notes data leakValery Sizov2016-05-314-4/+40
* | | | | | 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