summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Prevent ApplicationHelper specs from polluting later ones39253-jobs-fail-because-of-brazilian-portuguese-translationsSean McGivern2017-10-181-3/+3
| | | | | We don't want the locale to be set to Brazilian Portuguese for any subsequent specs!
* Merge branch 'bvl-fix-locale-path' into 'master'Tim Zallmann2017-10-181-0/+8
|\ | | | | | | | | | | | | Render region codes for locale assets with an `_` instead of a `-` Closes #39225 See merge request gitlab-org/gitlab-ce!14924
| * Build the locale path with an `_` instead of a `-`Bob Van Landuyt2017-10-181-0/+8
| | | | | | | | | | | | | | | | | | The locale code is turned into an asset path with an underscore instead of a dash. The language codes are transformed by `I18n.locale` into a code with a dash. But the resources for translating are always stored in a path using a `_` separating the language and the region code.
* | Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master'Tim Zallmann2017-10-181-20/+50
|\ \ | | | | | | | | | | | | Add lazy option to UserAvatarImage See merge request gitlab-org/gitlab-ce!14895
| * | 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 Gitaly Closes gitaly#638 See merge request gitlab-org/gitlab-ce!14870
| * | | Migrate Gitlab::Git::Wiki#write_page to Gitalyfeature/migrate-wiki-write-page-to-gitalyAhmad Sherif2017-10-161-24/+34
| | | | | | | | | | | | | | | | Closes gitaly#638
* | | | Merge branch 'sh-security-fix-backports-master' into 'master'Robert Speicher2017-10-186-58/+99
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport all fixes from GitLab 10.1 into master See merge request gitlab-org/gitlab-ce!14922
| * \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | Security fixes for 10.1 RC See merge request gitlab/gitlabhq!2209
* | | | | Merge branch '30140-restore-readme-only-preference' into 'master'Douwe Maan2017-10-182-6/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add readme only option as project view Closes #30140 See merge request gitlab-org/gitlab-ce!14900
| * | | | | 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 refname Closes #37032 See merge request gitlab-org/gitlab-ce!14884
| * | | | | | Get Project Branch API shows an helpful error message on invalid refnameJacopo2017-10-182-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In API v4 when requesting a branch with an invalid refname shows an helpful error message: 'The branch refname is invalid'.
* | | | | | | Merge branch 'tc-saml-fix-false-empty' into 'master'Douwe Maan2017-10-184-21/+68
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SAML fix when auth hash attributes do not define groups Closes #38923 See merge request gitlab-org/gitlab-ce!14913
| * | | | | | | Fix SAML error 500 when no groups are defined for usertc-saml-fix-false-emptyToon Claes2017-10-184-21/+68
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are no groups defined in the auth hash attributes, `Gitlab::Saml::AuthHash#groups` should return an empty array, and `Gitlab::Saml::User#find_user` should not mark the user as external. Closes gitlab-org/gitlab-ce#38923.
* | | | | | | Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'Grzegorz Bizon2017-10-183-5/+10
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add short_revision and use total_size Closes #39203 See merge request gitlab-org/gitlab-ce!14917
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored multi-file data structure See merge request gitlab-org/gitlab-ce!14862
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a test for flattenedFiles Changes the data method to not be an arrow method Various other review fixes
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed eslint
| * | | | | | | Spec updatesPhil Hughes2017-10-1611-195/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated as best as possible, a lot of tests still change the store and never reset the state back which can cause some issues with other tests.
| * | | | | | | Refactored multi-file data structurePhil Hughes2017-10-161-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves away from storing in a single array just to render the table. It now stores in a multi-dimensional array/object type where each entry in the array can have its own tree. This makes storing the data for future feature a little easier as there is only one way to store the data. Previously to insert a directory the code had to insert the directory & then the file at the right point in the array. Now the directory can be inserted anywhere & then a file can be quickly added into this directory. The rendering is still done with a single array, but this is handled through underscore. Underscore takes the array & then goes through each item to flatten it into one. It is done this way to save changing the markup away from table, keeping it as a table keeps it semantically correct.
* | | | | | | | 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 directory Closes #39169 See merge request gitlab-org/gitlab-ce!14901
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid using `Redis#keys` See merge request gitlab-org/gitlab-ce!14889
| * | | | | | | | | 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 project Closes #39196 See merge request gitlab-org/gitlab-ce!14916
| * | | | | | | | | | Fix errors when deleting a forked projectBob Van Landuyt2017-10-171-0/+17
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem would occur when the `ForkedProjectLink` was deleted, but the `ForkNetworkMember` was not. The delete would be rolled back and retried. But the error would not be saved because `Project#forked?` would still be true, because the `ForkNetworkMember` exists. But the `Project#forked_project_link` would be `nil`. So the validation for the visibility level would fail.
* | | | | | | | | | 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=1 Closes #34728 See merge request gitlab-org/gitlab-ce!14718
| * | | | | | | | | | Prevent creating multiple ApplicationSetting by forcing it to always have id=1prevent-creating-multiple-application-settingsKamil Trzcinski2017-10-161-0/+10
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch ↵Rémy Coutable2017-10-171-2/+19
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclass' into 'master' Resolve "Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits::Error: #<NoMethodError: undefined method `map' for nil:NilClass" Closes #39181 See merge request gitlab-org/gitlab-ce!14907
| * | | | | | | | | Handle null serialised commits in background migration39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclassSean McGivern2017-10-171-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already handled for diffs, but not commits.
* | | | | | | | | | Merge branch 'zj-gitaly-n-1-call-test' into 'master'Douwe Maan2017-10-171-11/+21
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow testing on Gitaly call count See merge request gitlab-org/gitlab-ce!14837
| * | | | | | | | | Allow testing on Gitaly call countZeger-Jan van de Weg2017-10-161-11/+21
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous efforts were aimed at detecting N + 1 queries, general regressions are hard to find and mitigate.
* | | | | | | | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-177-44/+60
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of from the configuration file
* | | | | | | | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-1734-433/+2941
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055
| * | | | | | | | | | Make sure we always return an array of hierarchiesBob Van Landuyt2017-10-132-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even when we pass an array of only a single object
View Lorry Controller Status