summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix tooltip padding to align to 8px gridpms-fix-tooltip-paddingPedro Moreira da Silva2017-10-181-1/+1
* Merge branch 'feature/migrate-wiki-write-page-to-gitaly' into 'master'Sean McGivern2017-10-186-36/+110
|\
| * Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitalyAhmad Sherif2017-10-166-36/+110
* | Merge branch '39201-improve-google-image' into 'master'35616-gke-1st-iterationPhil Hughes2017-10-182-1/+1
|\ \
| * | Replace google login image39201-improve-google-imageFilipa Lacerda2017-10-172-1/+1
* | | Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-1814-80/+149
|\ \ \
| * | | Remove already released CHANGELOG filessh-security-fix-backports-masterStan Hu2017-10-173-15/+0
| * | | Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-17234-2291/+6407
| |\ \ \
| * | | | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-1716-80/+141
| * | | | Update CHANGELOG.md for 10.0.4Jarka Kadlecova2017-10-161-0/+6
| * | | | Update CHANGELOG.md for 9.5.9Jarka Kadlecova2017-10-161-0/+8
| * | | | Update CHANGELOG.md for 9.4.7Jarka Kadlecova2017-10-161-0/+9
* | | | | Merge branch '30140-restore-readme-only-preference' into 'master'Douwe Maan2017-10-186-14/+41
|\ \ \ \ \
| * | | | | Small code style changesDouwe Maan2017-10-181-2/+2
| * | | | | Add readme title and check for rich_viewer30140-restore-readme-only-preferenceAnnabel Dunstone Gray2017-10-171-1/+6
| * | | | | Fix specAnnabel Dunstone Gray2017-10-161-1/+0
| * | | | | Add readme only option as project viewAnnabel Dunstone Gray2017-10-166-14/+37
* | | | | | Merge branch '37032-get-project-branch-invalid-name-message' into 'master'Rémy Coutable2017-10-184-8/+62
|\ \ \ \ \ \
| * | | | | | Get Project Branch API shows an helpful error message on invalid refnameJacopo2017-10-184-8/+62
* | | | | | | Merge branch 'tc-saml-fix-false-empty' into 'master'Douwe Maan2017-10-186-22/+74
|\ \ \ \ \ \ \
| * | | | | | | Fix SAML error 500 when no groups are defined for usertc-saml-fix-false-emptyToon Claes2017-10-186-22/+74
* | | | | | | | Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'Grzegorz Bizon2017-10-186-7/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix broken testkt/bug/fix-revision-and-size-for-container-registryFilipa Lacerda2017-10-171-2/+2
| * | | | | | | | Fix failed testKamil Trzcinski2017-10-171-2/+2
| * | | | | | | | Add short_revision and use total_sizeKamil Trzcinski2017-10-176-5/+15
* | | | | | | | | Merge branch 'improve-database-yml-examples' into 'master'Rémy Coutable2017-10-183-18/+30
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Update scripts/prepare_build.shbogdanvlviv2017-10-171-4/+2
| * | | | | | | | Update database.yml.postgresqlbogdanvlviv2017-10-171-11/+10
| * | | | | | | | Set 'staging specific' in database.yml.mysqlbogdanvlviv2017-10-171-3/+18
|/ / / / / / / /
* | | | | | | | Merge branch 'ph-multi-file-editor-restructure-data' into 'master'Filipa Lacerda2017-10-1733-735/+522
|\ \ \ \ \ \ \ \
| * | | | | | | | fixed Karam test because of event name changeph-multi-file-editor-restructure-dataPhil Hughes2017-10-171-2/+2
| * | | | | | | | Fixed bug when clicking file link causing user to navigate awayPhil Hughes2017-10-1713-35/+60
| * | | | | | | | fixed prev directory row not correctly having colspanPhil Hughes2017-10-163-9/+9
| * | | | | | | | fixed karma spec with prev directory buttonPhil Hughes2017-10-161-0/+1
| * | | | | | | | fixed karma build because of a removed methodPhil Hughes2017-10-161-1/+1
| * | | | | | | | made serializing genericPhil Hughes2017-10-164-26/+26
| * | | | | | | | fixed rendering bugsPhil Hughes2017-10-166-18/+7
| * | | | | | | | Spec updatesPhil Hughes2017-10-1614-221/+175
| * | | | | | | | Refactored multi-file data structurePhil Hughes2017-10-1617-483/+301
* | | | | | | | | Merge branch 'add-inline-edit-button' into 'master'Filipa Lacerda2017-10-176-17/+119
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add inline edit button to issue_show appClement Ho2017-10-176-17/+119
|/ / / / / / / / /
* | | | | | | | | Merge branch 'winh-project-deletion-message' into 'master'Annabel Dunstone Gray2017-10-172-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change project deletion message from alert to noticeWinnie Hellmann2017-10-172-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch '20930-very-first-commit-to-default-branch-didn-t-close-referenc...Rémy Coutable2017-10-171-3/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix #20930: automatic closing is not triggered on very first push.Sébastien2017-10-171-3/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'move-user-avatar-specs' into 'master'Phil Hughes2017-10-173-0/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move user avatar specs to folder to mimic javascript directorymove-user-avatar-specsClement Ho2017-10-163-0/+0
* | | | | | | | | | Merge branch 'improve-sprite-icon-spec' into 'master'Phil Hughes2017-10-171-10/+18
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Improve sprite icon specClement Ho2017-10-171-10/+18
|/ / / / / / / / /
* | | | | | | | | Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable2017-10-176-36/+33
|\ \ \ \ \ \ \ \ \