summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Resolve "/assign me quick action doesn't work if there is extra white space"Cindy Pallares 🦉2018-10-191-41/+38
|
* Merge branch 'ce-5987-group-file-templates' into 'master'Robert Speicher2018-10-191-0/+3
|\ | | | | | | | | CE backport of changes to suppport group file templates See merge request gitlab-org/gitlab-ce!22310
| * Harden a specNick Thomas2018-10-191-0/+3
| |
* | Rename "scheduled" label/badge of delayed jobs to "delayed"Shinya Maeda2018-10-195-7/+7
| |
* | Merge branch '51955-change-single-item-breadcrumbs-to-page-titles' into 'master'Annabel Dunstone Gray2018-10-191-2/+6
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Change single-item breadcrumbs to page titles" Closes #51955 See merge request gitlab-org/gitlab-ce!22155
| * | Change single-item breadcrumbs to page titlesDmitriy Zaporozhets2018-10-191-2/+6
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'jivl-fix-bar-char-transient-spec-failure' into 'master'Filipa Lacerda2018-10-191-6/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix transient failure from the bar_chart.vue component Closes gitlab-ee#8062 See merge request gitlab-org/gitlab-ce!22495
| * | | Fix transient failure from the bar_chart.vue componentJose Vargas2018-10-191-6/+0
| | | |
* | | | Merge branch 'gt-remove-empty-spec-describe-blocks' into 'master'Clement Ho2018-10-193-14/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Remove empty spec describe blocks Closes #52842 See merge request gitlab-org/gitlab-ce!22451
| * | | Remove empty spec describe blocksGeorge Tsiolis2018-10-183-14/+0
| | | |
* | | | Update used version of Runner Helm Chart to 0.1.34Tomasz Maczukin2018-10-191-3/+3
| |/ / |/| |
* | | Merge branch 'ccr/43034_issues_controller_100_queries' into 'master'Douglas Barbosa Alexandre2018-10-192-5/+78
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add preload for routes and namespaces for issues controller. Closes #43034 See merge request gitlab-org/gitlab-ce!21651
| * | | Add preload in issues controllerChantal Rollison2018-10-182-5/+78
| | | |
* | | | Change markdown header tab anchor links to buttonsGeorge Tsiolis2018-10-197-20/+20
| | | |
* | | | Merge branch 'mr-file-tree-inline-fluid-width-fix' into 'master'Filipa Lacerda2018-10-191-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed merge request fill tree not respecting fluid width Closes #52916 See merge request gitlab-org/gitlab-ce!22487
| * | | | Fixed merge request fill tree not respecting fluid widthPhil Hughes2018-10-191-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where the merge request fill tree would not respect the users fluid width preference. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
* | | | | Merge branch 'bvl-remove-forked-project-link' into 'master'Sean McGivern2018-10-1922-155/+153
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ForkedProjectLink model Closes #38883 See merge request gitlab-org/gitlab-ce!22226
| * | | | | Remove the `ForkedProjectLink` modelBob Van Landuyt2018-10-1922-155/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted.
* | | | | | Correctly process Bamboo API resultsAlex Lossent2018-10-191-1/+2
| |/ / / / |/| | | | | | | | | | | | | | | | | | | Bamboo API returns an array of results as per https://docs.atlassian.com/atlassian-bamboo/REST/6.2.5/#d2e786
* | | | | Catch `RedirectionTooDeep` Exception in webhooksHeinrich Lee Yu2018-10-192-1/+27
| | | | |
* | | | | Merge branch 'ac-review-app-changes-33418' into 'master'Nick Thomas2018-10-195-0/+131
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Expose changed URLs in MR ci_environments_status See merge request gitlab-org/gitlab-ce!22228
| * | | | Show modified and added public paths in MRAlessio Caiazza2018-10-182-0/+37
| | | | |
| * | | | Move ci_environments_status to a modelAlessio Caiazza2018-10-185-0/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GET :namespace/merge_requests/:id/ci_environments_status complexity already reached a limit for a direct serialization from an hash computed at within the controller function. Here we introduce a virtual model EnvironmentStatus and its serializer.
* | | | | Add support for JSON logging for audit eventsStan Hu2018-10-181-0/+26
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will add audit_json.log that writes one line per audit event. For example: { "severity":"INFO", "time":"2018-10-17T17:38:22.523Z", "author_id":3, "entity_id":2, "entity_type":"Project", "change":"visibility", "from":"Private", "to":"Public", "author_name":"John Doe4", "target_id":2, "target_type":"Project", "target_details":"namespace2/project2" }
* | | | Merge branch '52886-fix-broken-master' into 'master'Phil Hughes2018-10-181-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes broken test in master for ci status bagde Closes #52886 See merge request gitlab-org/gitlab-ce!22465
| * | | | Fixes broken test in master for ci status bagdeFilipa Lacerda2018-10-181-1/+1
| | | | |
* | | | | Merge branch 'rails5-fix-deployment-spec' into 'master'Douglas Barbosa Alexandre2018-10-181-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Rails5: fix deployment model spec See merge request gitlab-org/gitlab-ce!22428
| * | | | Rails5: fix deployment model specJasper Maes2018-10-171-1/+1
| | | | |
* | | | | Merge branch 'sh-backport-update-service-fix' into 'master'Sean McGivern2018-10-181-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Groups::UpdateService#execute not returning correct error code See merge request gitlab-org/gitlab-ce!22446
| * | | | | Fix Groups::UpdateService#execute not returning correct error codeStan Hu2018-10-181-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was causing problems in EE, where audit events were being generated even if the project failed to save.
* | | | | | Make getting a user by the username case insensitiveWilliam George2018-10-184-9/+210
|/ / / / /
* | | | | Merge branch 'sh-strip-github-pat-whitespace' into 'master'Rémy Coutable2018-10-181-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strip whitespace around GitHub personal access tokens Closes #46588 See merge request gitlab-org/gitlab-ce!22432
| * | | | | Strip whitespace around GitHub personal access tokensStan Hu2018-10-171-0/+12
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some browsers insert a trailing whitespace after pasting the token into the field. This should help reduce confusion. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/46588
* | | | | Merge branch 'master' into 'prettify-all-the-karma-specs'Mike Greiling2018-10-179-52/+130559
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # spec/javascripts/clusters/components/application_row_spec.js
| * \ \ \ \ Merge branch ↵Mike Greiling2018-10-171-9/+34
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '7493-configuring-prometheus-alerts-causes-cluster-install-page-to-display-error-message' into 'master' Backport: Resolve "Configuring Prometheus alerts causes Cluster Install page to display error message" See merge request gitlab-org/gitlab-ce!22408
| | * | | | | Add missing state on the application row componentJose Vargas2018-10-171-9/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the application row component weird state when an `updating` status is fetched, this causes apps to show as uninstalled even though they are installed in the cluster.
| * | | | | | Merge branch '52527-harden-wiki-against-missing-last-version' into 'master'Douglas Barbosa Alexandre2018-10-171-10/+20
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Harden the wiki against missing last_versions Closes #52527 See merge request gitlab-org/gitlab-ce!22377
| | * | | | | Harden the wiki against missing last_versionsNick Thomas2018-10-171-10/+20
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we assume a "last_version" always exists for a wiki page. In production, this is not always true. So, guard uses of it with a null check.
| * | | | | Merge branch '49591-use-cached-readme-blobs' into 'master'Rémy Coutable2018-10-172-11/+31
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use cached readme blobs where appropriate Closes #49591 See merge request gitlab-org/gitlab-ce!22325
| | * | | | | Use cached readme blobs where appropriateNick Thomas2018-10-172-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab keeps a cache of the rendered HTML for a repository's README as stored in the HEAD branch. However, it was not used in all circumstances. In particular, the new blob viewer framework bypassed this cache entirely. This MR ensures a ::ReadmeBlob is returned instead of a ::Blob when asking a repository for an individual blob, if the commit and path match the readme for HEAD. This makes the cached HTML available to consumers, including the blob viewer. The ReadmeBlob is a simple delegator to the Blob, so should be compatible in all cases. Adding the rendered_markdown method is the only additional behaviour it contains.
| * | | | | | Fixed bug with the content disposition with wiki attachmentsFrancisco Javier López2018-10-175-31/+130497
| | | | | | |
* | | | | | | Resolve eslint violationsMike Greiling2018-10-1731-40/+86
| | | | | | |
* | | | | | | Remove superfluous IIFEsMike Greiling2018-10-173-256/+250
| | | | | | |
* | | | | | | Prettify all spec filesMike Greiling2018-10-17285-4687/+5295
| | | | | | |
* | | | | | | Prettify awards_handler_spec.js scriptMike Greiling2018-10-171-356/+335
|/ / / / / /
* | | | | | Merge branch '44361-remove-gitlab-grit' into 'master'Rémy Coutable2018-10-171-4/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitlab-grit as a transitive dependency of GitLab Closes #44361 See merge request gitlab-org/gitlab-ce!22373
| * | | | | | Remove a dependency on gitlab-gollum-libnick.thomas/gitlab-ce-44361-remove-gitlab-gritNick Thomas2018-10-161-4/+43
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inlining this code allows us to remove a dependency on gitlab_grit in gitlab-ce. We can't stop maintaining gitlab_grit yet, since gitaly-ruby still depends on this gem, but it moves us a step closer.
* | | | | | Merge branch 'gt-update-environments-empty-state' into 'master'Filipa Lacerda2018-10-173-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update environments empty state See merge request gitlab-org/gitlab-ce!22297
| * | | | | | Update environments empty stateGeorge Tsiolis2018-10-173-5/+5
| | | | | | |
* | | | | | | Replace job with group in frontend components to be consistent with backendWinnie Hellmann2018-10-173-21/+20
| | | | | | |
View Lorry Controller Status