summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Fixes commit comments in side-by-side diff viewcommit-side-by-side-commentPhil Hughes2017-09-271-0/+36
| | | | | | | | | | This was caused by the `notes` global class not existing when the `file_comment_button` code is run. The notes class was used to check if the diff is currently in parallel view or not. To get around this I've added a check into the `file_comment_button` JS to check if the view is currently parallel or not. Closes #38117
* Merge branch ↵Rémy Coutable2017-09-271-0/+3
|\ | | | | | | | | | | | | | | | | '38378-testenv-can-t-handle-component-versions-with-a-branch-name-in-ci' into 'master' Fix component update with branch specifiers on CI Closes #38378 See merge request gitlab-org/gitlab-ce!14494
| * Fix component update with branch specifiers on CI38378-testenv-can-t-handle-component-versions-with-a-branch-name-in-ciAlejandro Rodríguez2017-09-261-0/+3
| |
* | Merge branch ↵Rémy Coutable2017-09-271-0/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '37467-helper-method-from-users-endpoint-overrides-api-helper-method' into 'master' find_user users helper method no longer overrides find_user API helper method. Closes #37467 See merge request gitlab-org/gitlab-ce!14418
| * | find_user users helper method no longer overrides find_user API helper method.37467-helper-method-from-users-endpoint-overrides-api-helper-methodTiago Botelho2017-09-261-0/+9
| | |
* | | Merge branch 'mr-side-by-side-breadcrumbs-container' into 'master'Filipa Lacerda2017-09-271-0/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Stop breadcrumbs changing container when in side-by-side diff Closes #37641 See merge request gitlab-org/gitlab-ce!14454
| * | | Stop breadcrumbs changing container when in side-by-side diffmr-side-by-side-breadcrumbs-containerPhil Hughes2017-09-251-0/+23
| | | | | | | | | | | | | | | | Closes #37641
* | | | Add a spec for Github::Client and revert an `if !` to `unless`38198-fetch-github-api-per-100Rémy Coutable2017-09-261-0/+34
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'dm-simple-project-avatar-url' into 'master'Rémy Coutable2017-09-263-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Expose avatar_url when requesting list of projects from API with simple=true See merge request gitlab-org/gitlab-ce!14498
| * | | | Expose avatar_url when requesting list of projects from API with simple=truedm-simple-project-avatar-urlDouwe Maan2017-09-263-0/+3
| | |_|/ | |/| |
* | | | Merge branch 'dm-bitbucket-import-truncated-shas' into 'master'Robert Speicher2017-09-262-0/+93
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug that caused merge requests with diff notes imported from Bitbucket to raise errors Closes #38100 See merge request gitlab-org/gitlab-ce!14438
| * | | | Add specsdm-bitbucket-import-truncated-shasDouwe Maan2017-09-252-0/+93
| | |_|/ | |/| |
* | | | Merge branch 'expose-last-pipeline-for-a-commit' into 'master'Rémy Coutable2017-09-263-2/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose last pipeline details in API response when getting a single commit Closes #35692 See merge request gitlab-org/gitlab-ce!13521
| * | | | Expose last pipeline details in API response when getting a single commitMehdi Lahmam2017-09-263-2/+30
| | | | | | | | | | | | | | | | | | | | Closes #35692.
* | | | | Merge branch 'changes-bar-dynamic-placeholder' into 'master'Filipa Lacerda2017-09-261-24/+51
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Dynamically create offset for sticky bar See merge request gitlab-org/gitlab-ce!14280
| * | | | remove the sticky el from the test DOM after each testchanges-bar-dynamic-placeholderPhil Hughes2017-09-251-2/+6
| | | | |
| * | | | refactor tests to actually test browser behaviourPhil Hughes2017-09-251-48/+37
| | | | |
| * | | | fixed and added specs for removing placeholder elementPhil Hughes2017-09-221-3/+37
| | | | |
* | | | | Moves cycle analytics components into vue filesFilipa Lacerda2017-09-261-1/+1
| | | | |
* | | | | Merge branch 'remove-old-nav-styles' into 'master'Phil Hughes2017-09-263-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove old nav code - Part 1 See merge request gitlab-org/gitlab-ce!14379
| * | | | | Fix specsAnnabel Dunstone Gray2017-09-253-3/+3
| | | | | |
* | | | | | Merge branch 'fix-locked-shared-runners-problem' into 'master'Kamil Trzciński2017-09-261-51/+18
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix locked shared runners problem Closes gitlab-runner#2782 See merge request gitlab-org/gitlab-ce!14483
| * | | | | Fix locked shared runners problemTomasz Maczukin2017-09-251-51/+18
| |/ / / /
* | | | | 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
| | | | | | |
View Lorry Controller Status