Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge branch 'pms-fix-tooltip-padding' into 'master' | Annabel Dunstone Gray | 2017-10-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix tooltip padding to align to 8px gridpms-fix-tooltip-padding | Pedro Moreira da Silva | 2017-10-18 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch '39237-fix-ee_compat_check' into 'master' | Sean McGivern | 2017-10-18 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Improve the gitlab:dev:ee_compat_check task to pass a repo URL without creden...39237-fix-ee_compat_check | Rémy Coutable | 2017-10-18 | 1 | -1/+3 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'bvl-fix-locale-path' into 'master' | Tim Zallmann | 2017-10-18 | 4 | -1/+18 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Build the locale path with an `_` instead of a `-` | Bob Van Landuyt | 2017-10-18 | 4 | -1/+18 | |
* | | | | | | | | | | Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master' | Tim Zallmann | 2017-10-18 | 3 | -28/+78 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-component | Eric Eastwood | 2017-10-17 | 3 | -28/+78 | |
* | | | | | | | | | | | Merge branch 'fix-resolved-side-by-side' into 'master' | Phil Hughes | 2017-10-18 | 3 | -7/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix resolved discussions not expanding on side by side view | Clement Ho | 2017-10-18 | 3 | -7/+31 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch '38986-due-date' into 'master' | Phil Hughes | 2017-10-18 | 13 | -50/+115 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix Pikaday | Filipa Lacerda | 2017-10-18 | 13 | -50/+115 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'feature/migrate-wiki-write-page-to-gitaly' into 'master' | Sean McGivern | 2017-10-18 | 6 | -36/+110 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitaly | Ahmad Sherif | 2017-10-16 | 6 | -36/+110 | |
* | | | | | | | | | | Merge branch '39201-improve-google-image' into 'master'35616-gke-1st-iteration | Phil Hughes | 2017-10-18 | 2 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Replace google login image39201-improve-google-image | Filipa Lacerda | 2017-10-17 | 2 | -1/+1 | |
* | | | | | | | | | | | Merge branch 'sh-security-fix-backports-master' into 'master' | Robert Speicher | 2017-10-18 | 14 | -80/+149 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Remove already released CHANGELOG filessh-security-fix-backports-master | Stan Hu | 2017-10-17 | 3 | -15/+0 | |
| * | | | | | | | | | | | Merge branch 'master' into sh-security-fix-backports-master | Stan Hu | 2017-10-17 | 234 | -2291/+6407 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'security-10-1' into '10-1-stable' | Jen-Shin Lin | 2017-10-17 | 16 | -80/+141 | |
| * | | | | | | | | | | | Update CHANGELOG.md for 10.0.4 | Jarka Kadlecova | 2017-10-16 | 1 | -0/+6 | |
| * | | | | | | | | | | | Update CHANGELOG.md for 9.5.9 | Jarka Kadlecova | 2017-10-16 | 1 | -0/+8 | |
| * | | | | | | | | | | | Update CHANGELOG.md for 9.4.7 | Jarka Kadlecova | 2017-10-16 | 1 | -0/+9 | |
* | | | | | | | | | | | | Merge branch '30140-restore-readme-only-preference' into 'master' | Douwe Maan | 2017-10-18 | 6 | -14/+41 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Small code style changes | Douwe Maan | 2017-10-18 | 1 | -2/+2 | |
| * | | | | | | | | | | | | Add readme title and check for rich_viewer30140-restore-readme-only-preference | Annabel Dunstone Gray | 2017-10-17 | 1 | -1/+6 | |
| * | | | | | | | | | | | | Fix spec | Annabel Dunstone Gray | 2017-10-16 | 1 | -1/+0 | |
| * | | | | | | | | | | | | Add readme only option as project view | Annabel Dunstone Gray | 2017-10-16 | 6 | -14/+37 | |
* | | | | | | | | | | | | | Merge branch '37032-get-project-branch-invalid-name-message' into 'master' | Rémy Coutable | 2017-10-18 | 4 | -8/+62 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Get Project Branch API shows an helpful error message on invalid refname | Jacopo | 2017-10-18 | 4 | -8/+62 | |
* | | | | | | | | | | | | | | Merge branch 'tc-saml-fix-false-empty' into 'master' | Douwe Maan | 2017-10-18 | 6 | -22/+74 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix SAML error 500 when no groups are defined for usertc-saml-fix-false-empty | Toon Claes | 2017-10-18 | 6 | -22/+74 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master' | Grzegorz Bizon | 2017-10-18 | 6 | -7/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix broken testkt/bug/fix-revision-and-size-for-container-registry | Filipa Lacerda | 2017-10-17 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | Fix failed test | Kamil Trzcinski | 2017-10-17 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | Add short_revision and use total_size | Kamil Trzcinski | 2017-10-17 | 6 | -5/+15 | |
* | | | | | | | | | | | | | | Merge branch 'improve-database-yml-examples' into 'master' | Rémy Coutable | 2017-10-18 | 3 | -18/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Update scripts/prepare_build.sh | bogdanvlviv | 2017-10-17 | 1 | -4/+2 | |
| * | | | | | | | | | | | | | Update database.yml.postgresql | bogdanvlviv | 2017-10-17 | 1 | -11/+10 | |
| * | | | | | | | | | | | | | Set 'staging specific' in database.yml.mysql | bogdanvlviv | 2017-10-17 | 1 | -3/+18 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'ph-multi-file-editor-restructure-data' into 'master' | Filipa Lacerda | 2017-10-17 | 33 | -735/+522 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | fixed Karam test because of event name changeph-multi-file-editor-restructure-data | Phil Hughes | 2017-10-17 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | Fixed bug when clicking file link causing user to navigate away | Phil Hughes | 2017-10-17 | 13 | -35/+60 | |
| * | | | | | | | | | | | | | fixed prev directory row not correctly having colspan | Phil Hughes | 2017-10-16 | 3 | -9/+9 | |
| * | | | | | | | | | | | | | fixed karma spec with prev directory button | Phil Hughes | 2017-10-16 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | fixed karma build because of a removed method | Phil Hughes | 2017-10-16 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | made serializing generic | Phil Hughes | 2017-10-16 | 4 | -26/+26 | |
| * | | | | | | | | | | | | | fixed rendering bugs | Phil Hughes | 2017-10-16 | 6 | -18/+7 | |
| * | | | | | | | | | | | | | Spec updates | Phil Hughes | 2017-10-16 | 14 | -221/+175 | |
| * | | | | | | | | | | | | | Refactored multi-file data structure | Phil Hughes | 2017-10-16 | 17 | -483/+301 |