summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add a new RSpec::EnvAssignment cop to prevent assigning to ENV in specs18765-stub_env_in_specsRémy Coutable2017-10-184-5/+135
* Stub ENV in the LDAP task spec fileRémy Coutable2017-10-181-1/+1
* Stub ENV in the Gitaly task spec fileRémy Coutable2017-10-181-8/+1
* Stub ENV in the backup task spec fileRémy Coutable2017-10-183-188/+109
* Merge branch '39253-jobs-fail-because-of-brazilian-portuguese-translations' i...Rémy Coutable2017-10-181-3/+3
|\
| * Prevent ApplicationHelper specs from polluting later ones39253-jobs-fail-because-of-brazilian-portuguese-translationsSean McGivern2017-10-181-3/+3
* | Merge branch 'pms-fix-tooltip-padding' into 'master'Annabel Dunstone Gray2017-10-181-1/+1
|\ \
| * | Fix tooltip padding to align to 8px gridpms-fix-tooltip-paddingPedro Moreira da Silva2017-10-181-1/+1
* | | Merge branch '39237-fix-ee_compat_check' into 'master'Sean McGivern2017-10-181-1/+3
|\ \ \ | |_|/ |/| |
| * | Improve the gitlab:dev:ee_compat_check task to pass a repo URL without creden...39237-fix-ee_compat_checkRémy Coutable2017-10-181-1/+3
|/ /
* | Merge branch 'bvl-fix-locale-path' into 'master'Tim Zallmann2017-10-184-1/+18
|\ \
| * | Build the locale path with an `_` instead of a `-`Bob Van Landuyt2017-10-184-1/+18
* | | Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master'Tim Zallmann2017-10-183-28/+78
|\ \ \
| * | | Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-componentEric Eastwood2017-10-173-28/+78
* | | | Merge branch 'fix-resolved-side-by-side' into 'master'Phil Hughes2017-10-183-7/+31
|\ \ \ \
| * | | | Fix resolved discussions not expanding on side by side viewClement Ho2017-10-183-7/+31
|/ / / /
* | | | Merge branch '38986-due-date' into 'master'Phil Hughes2017-10-1813-50/+115
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix PikadayFilipa Lacerda2017-10-1813-50/+115
|/ / /
* | | 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
View Lorry Controller Status