summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Title has now its own testdm-json-page-titleTim Zallmann2017-09-291-4/+11
|
* Not the Test will also work with other tests beforeTim Zallmann2017-09-291-3/+3
|
* Added Test for PageTitle / Removed Gitlab Part from TItleTim Zallmann2017-09-291-0/+5
|
* Merge branch 'rc/tag-specs' into 'master'38362-delayed-pr-merge-wait-time-40m-1hRobert Speicher2017-09-251-2/+10
|\ | | | | | | | | Add a `:type` to all specs See merge request gitlab-org/gitlab-ce!14371
| * Automatically set a :type for specsrc/tag-specsRémy Coutable2017-09-221-2/+10
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'gitaly-508-find-commits' into 'master'38204-comment-form-doesn-t-switch-back-to-write-tab-after-submittingDouwe Maan2017-09-251-1/+9
|\ \ | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#log to Gitaly Closes gitaly#508 See merge request gitlab-org/gitlab-ce!14179
| * | Migrate Gitlab::Git::Repository#log to GitalyKim "BKC" Carlbäcker2017-09-251-1/+9
| | |
* | | Merge branch '38189-fix-user-avatar-url-cdn' into 'master'Douwe Maan2017-09-251-40/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prevent URL concatenation for avatars Closes #38189 See merge request gitlab-org/gitlab-ce!14437
| * | | Update tests to reflect `user_avatar_without_link` helper changes38189-fix-user-avatar-url-cdnkushalpandya2017-09-251-40/+62
| | | |
* | | | Merge branch 'improve_sorting_list' into 'master'Douwe Maan2017-09-257-117/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve list of sorting options Closes #36929 See merge request gitlab-org/gitlab-ce!14320
| * | | | Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-237-117/+49
| |/ / /
* | | | Merge branch 'project-page-clearer' into 'master'Filipa Lacerda2017-09-253-4/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add context tabs to dashboard/projects Closes #29045 See merge request gitlab-org/gitlab-ce!14364
| * | | | Fixes dashboard/projects empty state showing when viewing personal projectsPhil Hughes2017-09-221-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | This was caused by the `@projects` value being empty when the current user does not have any personal projects.
| * | | | Add context tabs to dashboard/projectsPhil Hughes2017-09-222-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows users to quickly switch between all projects they have access to & there own namespace projects. These tabs also keep the same filtering/search options selected so the user can quickly switch between the two different contexts. Closes #29045
* | | | | Merge branch 'fly-out-nav-mousepos-error' into 'master'Filipa Lacerda2017-09-251-0/+6
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Fixed fly-out error if mousePos array is empty See merge request gitlab-org/gitlab-ce!14338
| * | | | Fixed fly-out error if mousePos array is emptyPhil Hughes2017-09-221-0/+6
| | | | |
* | | | | Merge branch '38280-undefined-run_command-when-running-rake-gitlab-check' ↵Douwe Maan2017-09-252-0/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Undefined run_command when running rake gitlab:check" Closes #38280 See merge request gitlab-org/gitlab-ce!14469
| * | | | | Fixed few gitlab:check tasks that were failing with exception38280-undefined-run_command-when-running-rake-gitlab-checkGabriel Mazetto2017-09-252-0/+37
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs-allow-name-on-anchors' into 'master'Douwe Maan2017-09-251-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-allow `name` attribute on user-provided anchor HTML Closes #38196 See merge request gitlab-org/gitlab-ce!14452
| * | | | | Make the "customizes the whitelist only once" spec less brittlers-allow-name-on-anchorsRobert Speicher2017-09-221-1/+3
| | | | | |
| * | | | | Re-allow `name` attribute on user-provided anchor HTMLRobert Speicher2017-09-221-1/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'rc/refactor-project_policy_spec-ce' into 'master'Douwe Maan2017-09-251-47/+86
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Refactor spec/policies/project_policy_spec.rb to minimize the diff with EE See merge request gitlab-org/gitlab-ce!14434
| * | | | Refactor spec/policies/project_policy_spec.rb to minimize the diff with EErc/refactor-project_policy_spec-ceRémy Coutable2017-09-221-47/+86
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '36549-circuit-breaker-handles-missing-storages' into 'master'Douwe Maan2017-09-224-12/+98
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the git circuit breaker to correctly handle missing repository storages Closes #36549 See merge request gitlab-org/gitlab-ce!14417
| * | | | | Allow the git circuit breaker to correctly handle missing repository storagesNick Thomas2017-09-224-12/+98
| | | | | |
* | | | | | Removed old icons from project pagePhil Hughes2017-09-221-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'replace_project_shortcuts.feature' into 'master'Rémy Coutable2017-09-223-21/+114
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Replace the 'project/shortcuts.feature' spinach test with an rspec analog See merge request gitlab-org/gitlab-ce!14431
| * | | | Replace the 'project/shortcuts.feature' spinach test with an rspec analogreplace_project_shortcuts.featureVitaliy @blackst0ne Klachkov2017-09-223-21/+114
| | | | |
* | | | | Merge branch '33328-usage-ping-for-gitlab-features-and-components' into 'master'Rémy Coutable2017-09-221-0/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds gitlab features and components to usage ping data. Closes #33328 See merge request gitlab-org/gitlab-ce!14305
| * | | | | Adds gitlab features and components to usage ping data.33328-usage-ping-for-gitlab-features-and-componentsTiago Botelho2017-09-211-0/+36
| | | | | |
* | | | | | Merge branch 'sh-blob-raw-check' into 'master'Douwe Maan2017-09-221-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that Blob.raw returns always returns a valid blob object See merge request gitlab-org/gitlab-ce!14412
| * | | | | | Ensure that Blob.raw returns always returns a valid blob objectsh-blob-raw-checkStan Hu2017-09-211-0/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In gitlab-org/gitlab-ee!2976, we saw that a given OID could point to a commit, which would cause the delta size check to fail. Gitaly already returns nil if the OID isn't a blob, so this change makes the Rugged implementation consistent.
* | | | | | Merge branch 'backport-ee-2983' into 'master'Rémy Coutable2017-09-221-6/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Simplify a test See merge request gitlab-org/gitlab-ce!14415
| * | | | | Simplify a testNick Thomas2017-09-211-6/+1
| |/ / / /
* | | | | Resolve "Better SVG Usage in the Frontend"Tim Zallmann2017-09-227-1/+69
| |_|_|/ |/| | |
* | | | Merge branch 'add-view-replaced-file-link' into 'master'Rémy Coutable2017-09-221-5/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add view replaced file link for image diffs See merge request gitlab-org/gitlab-ce!14394
| * | | | Add view replaced file link for image diffsadd-view-replaced-file-linkClement Ho2017-09-201-5/+35
| | | | |
* | | | | Merge branch 'replace_project_service.feature' into 'master'Rémy Coutable2017-09-2216-27/+342
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the 'project/service.feature' spinach test with an rspec analog Closes #23036 See merge request gitlab-org/gitlab-ce!14432
| * | | | | Replace the 'project/service.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-2216-27/+342
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix-multi-line-hook-output' into 'master'Rémy Coutable2017-09-221-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Display full pre-receive and post-receive hook output in GitLab UI Closes #25214 See merge request gitlab-org/gitlab-ce!14222
| * | | | Display full pre-receive and post-receive hook output in GitLab UIRobin Bobbitt2017-09-211-1/+2
| | |/ / | |/| |
* | | | Fix rendering double note issue.Fatih Acet2017-09-222-10/+21
| |_|/ |/| |
* | | Merge branch 'acet-fix-comment-form-resize' into 'master'Jacob Schatz2017-09-211-0/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | IssueNotes: Resize comment form after note submit and discard. Closes #38115 See merge request gitlab-org/gitlab-ce!14401
| * | | IssueNotes: Resize comment form after note submit and discard.acet-fix-comment-form-resizeFatih Acet2017-09-211-0/+14
| | | |
* | | | Standardize access to CSRF token in JavaScriptBryce Johnson2017-09-211-0/+49
| | | |
* | | | Merge branch 'dm-closing-issue-urls' into 'master'Robert Speicher2017-09-211-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly detect multiple issue URLs after 'Closes...' in MR descriptions Closes #33745 See merge request gitlab-org/gitlab-ce!14411
| * | | | Correctly detect multiple issue URLs after 'Closes...' in MR descriptionsdm-closing-issue-urlsDouwe Maan2017-09-211-2/+2
| | |/ / | |/| |
* | | | Adds EE tag detection to remove_old in gitlab backup.Tiago Botelho2017-09-211-5/+11
|/ / /
* | | Merge branch '37220-es-modules' into 'master'Phil Hughes2017-09-215-336/+363
|\ \ \ | | | | | | | | | | | | | | | | Use modules in common utils See merge request gitlab-org/gitlab-ce!14074
| * \ \ Merge branch 'master' into 37220-es-modulesMike Greiling2017-09-18112-2246/+3943
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (148 commits) Remove gaps under nav on build page Replace the 'project/snippets.feature' spinach test with an rspec analog Use correct group members path for members flyout link Replace the 'project/commits/revert.feature' spinach test with an rspec analog Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0' Replace the 'project/archived.feature' spinach test with an rspec analog Fix broken link in docs/api/wiki.md Fixed the new sidebars width when browser has scrollbars Improve 'spec/features/profiles/*' specs Replace the 'search.feature' spinach test with an rspec analog dedupe yarn packages add dependency approvals (all MIT license) update build image to latest with node 8.x, yarn 1.0.2, and chrome 61 Ensure we use `Entities::User` for non-admin `users/:id` API requests Minor update to address Sean McGivern's comment. Add data migration Fix setting share_with_group_lock created services for keys Prepare Repository#merge for migration to Gitaly Never connect to webpack-dev-server over SSL ...
View Lorry Controller Status