summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Prevent ApplicationHelper specs from polluting later ones39253-jobs-fail-because-of-brazilian-portuguese-translationsSean McGivern2017-10-181-3/+3
* Merge branch 'bvl-fix-locale-path' into 'master'Tim Zallmann2017-10-181-0/+8
|\
| * Build the locale path with an `_` instead of a `-`Bob Van Landuyt2017-10-181-0/+8
* | Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master'Tim Zallmann2017-10-181-20/+50
|\ \
| * | Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-componentEric Eastwood2017-10-171-20/+50
* | | Fix resolved discussions not expanding on side by side viewClement Ho2017-10-181-5/+24
* | | Fix PikadayFilipa Lacerda2017-10-181-0/+29
* | | Merge branch 'feature/migrate-wiki-write-page-to-gitaly' into 'master'Sean McGivern2017-10-181-24/+34
|\ \ \
| * | | Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitalyAhmad Sherif2017-10-161-24/+34
* | | | Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-186-58/+99
|\ \ \ \
| * \ \ \ Merge branch 'master' into sh-security-fix-backports-masterStan Hu2017-10-1767-764/+3318
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'security-10-1' into '10-1-stable'Jen-Shin Lin2017-10-176-58/+99
* | | | | Merge branch '30140-restore-readme-only-preference' into 'master'Douwe Maan2017-10-182-6/+9
|\ \ \ \ \
| * | | | | Add readme only option as project viewAnnabel Dunstone Gray2017-10-162-6/+9
* | | | | | Merge branch '37032-get-project-branch-invalid-name-message' into 'master'Rémy Coutable2017-10-182-0/+43
|\ \ \ \ \ \
| * | | | | | Get Project Branch API shows an helpful error message on invalid refnameJacopo2017-10-182-0/+43
* | | | | | | Merge branch 'tc-saml-fix-false-empty' into 'master'Douwe Maan2017-10-184-21/+68
|\ \ \ \ \ \ \
| * | | | | | | Fix SAML error 500 when no groups are defined for usertc-saml-fix-false-emptyToon Claes2017-10-184-21/+68
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'Grzegorz Bizon2017-10-183-5/+10
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | 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-173-3/+8
* | | | | | | Merge branch 'ph-multi-file-editor-restructure-data' into 'master'Filipa Lacerda2017-10-1712-227/+164
|\ \ \ \ \ \ \
| * | | | | | | 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-172-2/+15
| * | | | | | | 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
| * | | | | | | fixed rendering bugsPhil Hughes2017-10-161-0/+1
| * | | | | | | Spec updatesPhil Hughes2017-10-1611-195/+150
| * | | | | | | Refactored multi-file data structurePhil Hughes2017-10-161-33/+0
* | | | | | | | Add inline edit button to issue_show appClement Ho2017-10-172-3/+47
* | | | | | | | Change project deletion message from alert to noticeWinnie Hellmann2017-10-171-1/+1
* | | | | | | | 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
* | | | | | | | | Improve sprite icon specClement Ho2017-10-171-10/+18
* | | | | | | | | Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable2017-10-173-30/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't use `Redis#keys` in the circuitbreakerbvl-do-not-use-redis-keysBob Van Landuyt2017-10-173-30/+12
* | | | | | | | | | Merge branch 'bvl-fix-deleting-forked-projects' into 'master'Douwe Maan2017-10-171-0/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix errors when deleting a forked projectBob Van Landuyt2017-10-171-0/+17
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'prevent-creating-multiple-application-settings' into 'master'Yorick Peterse2017-10-171-0/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Prevent creating multiple ApplicationSetting by forcing it to always have id=1prevent-creating-multiple-application-settingsKamil Trzcinski2017-10-161-0/+10
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '39181-gitlab-backgroundmigration-deserializemergerequestdiffsan...Rémy Coutable2017-10-171-2/+19
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Handle null serialised commits in background migration39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclassSean McGivern2017-10-171-2/+19
* | | | | | | | | | Merge branch 'zj-gitaly-n-1-call-test' into 'master'Douwe Maan2017-10-171-11/+21
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Allow testing on Gitaly call countZeger-Jan van de Weg2017-10-161-11/+21
| |/ / / / / / / /
* | | | | | | | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-177-44/+60
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow configuring the circuitbreaker through the API and UIBob Van Landuyt2017-10-172-1/+17
| * | | | | | | | | Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-175-43/+43
* | | | | | | | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-1734-433/+2941
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make sure we always return an array of hierarchiesBob Van Landuyt2017-10-132-0/+18
View Lorry Controller Status