summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix/cycle-analytics-no-data' into 'master' Sean McGivern2016-11-211-0/+43
|\ | | | | | | | | Adds a flag to reflect whether or not there is data in cycle analytics See merge request !7622
| * Updated code based on feedbackfix/cycle-analytics-no-dataJames Lopez2016-11-211-2/+2
| |
| * Adds a flag to reflect whether or not there is data in cycle analyticsJames Lopez2016-11-211-0/+43
| |
* | Merge branch 'fix-xss-vulnerability' into 'master' Fatih Acet2016-11-211-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove v-html ## What does this MR do? Uses string interpolation instead of `v-html` to prevent xss attacks. ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7616
| * | Remove v-htmlFilipa Lacerda2016-11-211-1/+1
| | |
* | | Merge branch 'grapify-project-snippet-api' into 'master' Rémy Coutable2016-11-211-14/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Grapify the projects snippet API Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/22928 See merge request !7621
| * | | Grapify the projects snippet APIgrapify-project-snippet-apiRobert Schilling2016-11-211-14/+50
| | | |
* | | | Merge branch 'smarter-cache-invalidation' into 'master' Sean McGivern2016-11-217-284/+454
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smarter cache invalidation Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23550 See merge request !7360
| * | | | Refactor cache refreshing/expiringYorick Peterse2016-11-216-334/+352
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactors repository caching so it's possible to selectively refresh certain caches, instead of just expiring and refreshing everything. To allow this the various methods that were cached (e.g. "tag_count" and "readme") use a similar pattern that makes expiring and refreshing their data much easier. In this new setup caches are refreshed as follows: 1. After a commit (but before running ProjectCacheWorker) we expire some basic caches such as the commit count and repository size. 2. ProjectCacheWorker will recalculate the commit count, repository size, then refresh a specific set of caches based on the list of files changed in a push payload. This requires a bunch of changes to the various methods that may be cached. For one, data should not be cached if a branch used or the entire repository does not exist. To prevent all these methods from handling this manually this is taken care of in Repository#cache_method_output. Some methods still manually check for the existence of a repository but this result is also cached. With selective flushing implemented ProjectCacheWorker no longer uses an exclusive lease for all of its work. Instead this worker only uses a lease to limit the number of times the repository size is updated as this is a fairly expensive operation.
| * | | | Use File.exist? to check if a repository existsYorick Peterse2016-11-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initializing Rugged objects is way too expensive just to check if a repository exists. Even though we cache this data once in a while we have to refresh this. On GitLab.com we have seen Repository#exists? taking up to _1 minute_ to complete in the absolute worst case, though usually it sits around a second or so. Using File.exist? to instead check if $GIT_DIR/refs exists is a much faster way of checking if a repository was initialized properly.
| * | | | Unify detecting of special repository filesYorick Peterse2016-11-212-0/+153
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the logic of detecting special repository files (e.g. a README or a Koding configuration file) to a single class: Gitlab::FileDetector. Moving this logic into a single place allows this to be re-used more easily. This commit also changes Repository#gitlab_ci_yaml so that its cached similar to other data (e.g. the Koding configuration file).
* | | | Merge branch 'issue_24303' into 'master' Sean McGivern2016-11-211-17/+48
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Allow JIRA references for project snippets closes #24303 See merge request !7541
| * | | Allow JIRA references for project snippetsissue_24303Felipe Artur2016-11-211-17/+48
| | | |
* | | | Merge branch 'fix/cycle-analytics-permissions' into 'master' Sean McGivern2016-11-211-0/+127
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Added permissions per stage to cycle analytics endpoint See merge request !7613
| * | | | refactored a couple of things based on feedbackfix/cycle-analytics-permissionsJames Lopez2016-11-217-7/+7
| | | | |
| * | | | fix spec failureJames Lopez2016-11-211-1/+1
| | | | |
| * | | | Added permissions per stage to cycle analytics endpointJames Lopez2016-11-219-8/+135
| | | | |
* | | | | Merge branch ↵Fatih Acet2016-11-211-1/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24552-js-environment-timeago-is-not-rendered-and-text-shows-object-object-in-mr-widget' into 'master' Fix timeago rendering for environment timeago ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24552 See merge request !7539
| * | | | | Fix timeago rendering for environment timeago24552-js-environment-timeago-is-not-rendered-and-text-shows-object-object-in-mr-widgetClement Ho2016-11-191-1/+53
| |/ / / /
* | | | | Merge branch ↵Kamil Trzciński2016-11-214-10/+55
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-running' into 'master' Resolve "MR shows "The build for this merge request failed" although builds still running" Closes #24616 See merge request !7579
| * | | | Fix a wrong "The build for this merge request failed" message24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-runningRémy Coutable2016-11-214-10/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also allow merge request to be merged with skipped pipeline and the "only allow merge when pipeline is green" feature enabled Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'fix/do-not-add-todo-when-build-allowed-to-fail' into 'master' 24710-external-statuses-pipelineKamil Trzciński2016-11-211-5/+28
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not create TODO when build is allowed to fail ## What does this MR do? Do not create a TODO when build that failed is allowed to fail. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [ ] All builds are passing ## What are the relevant issue numbers? Closes #22280 See merge request !7618
| * | | | Do not create TODO when build is allowed to failGrzegorz Bizon2016-11-211-5/+28
| | | | |
* | | | | Merge branch 'grapify-users-api' into 'master' Rémy Coutable2016-11-211-27/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the users API Certain endpoints return different entities based on which user issues the request. Right now, I am not aware how to specify multiple entities as part of the description block of the endpoint. @rymai Do you know something about that. ## What are the relevant issue numbers? Related to #22928 See merge request !7147
| * | | | | Grapify the users APIgrapify-users-apiRobert Schilling2016-11-211-27/+49
| | | | | |
* | | | | | Merge branch 'dz-fix-group-name-dot' into 'master' Rémy Coutable2016-11-211-5/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add constraints to group id in routing To prevent 404 when visit page like https://gitlab.com/groups/group.with.dot/activity Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24622 See merge request !7614
| * | | | | | Fix 404 on some group pages when name contains dotdz-fix-group-name-dotDmitriy Zaporozhets2016-11-211-5/+13
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'create-pipeline-endpoint' into 'master' Rémy Coutable2016-11-211-0/+46
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint for creating a pipeline Fixes #23468 See merge request !7209
| * | | | | Add api endpoint for creating a pipelineIdo Leibovich2016-11-181-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | Add a new endpoint in the new API for creating a new pipeline, and return the details of that pipeline.
* | | | | | Merge branch 'issue_5541' into 'master' Sean McGivern2016-11-215-7/+49
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to block JIRA events for commits and merge requests implements #5541 See merge request !7469
| * | | | | Allow enabling and disabling commit and MR events for JIRAissue_5541Felipe Artur2016-11-185-7/+49
| | | | | |
* | | | | | Merge branch 'use-build-in-broadcast-message-spec' into 'master' Rémy Coutable2016-11-211-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Use build instead create in BroadcastMessage model spec See merge request !7592
| * | | | | Use build instead create in BroadcastMessage model specSemyon Pupkov2016-11-191-1/+1
| | | | | |
* | | | | | Merge branch '24627-fix-bad-mr-error-message' into 'master' Rémy Coutable2016-11-211-0/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes regression causing an error message to appear when user first enters the Merge Request form. Closes #24627 See merge request !7599
| * | | | | Fix regression in Merge request formAlex Sanford2016-11-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request !7163 caused an error message to appear on the Merge Request form when it was first loaded by the user. This commit fixes that regression bug.
* | | | | | Merge branch '24673-broken-test-in-merge_request_widget_spec-js' into 'master' Jacob Schatz2016-11-191-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken merge request widget spec ## What does this MR do? Converts the invalid es6 syntax of the merge_request_widget_spec which is actually causing the spec not to run through teaspoon ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Get specs working again ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24673 See merge request !7594
| * | | | | | Fix spec24673-broken-test-in-merge_request_widget_spec-jsClement Ho2016-11-181-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch '22539-display-folders' into 'master' Fatih Acet2016-11-1919-230/+990
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Display "folders" for environments" ## What does this MR do? Adds the ability to show the grouped environments inside "folders". Adds several reusable vue components in order to accomplish the recursive tree data structure presented. For the individual components, Jasmine tests were added. For the ones that depend of an API response, rspec tests are used. ## Screenshots (if relevant) ![Screen_Shot_2016-11-16_at_02.00.13](/uploads/1278012c8639b999b53f080728d283e1/Screen_Shot_2016-11-16_at_02.00.13.png) ![Screen_Shot_2016-11-16_at_02.00.25](/uploads/a3d65416ddb553e1b8f0f4c8897a75dc/Screen_Shot_2016-11-16_at_02.00.25.png) ![Screen_Shot_2016-10-17_at_16.08.50](/uploads/af63efe1d2cbd5fc069408622ef4b607/Screen_Shot_2016-10-17_at_16.08.50.png) ![environments](/uploads/b5a1801766d82ab176fc60f96b6968cb/environments.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22539 See merge request !7015
| * | | | | Fix test22539-display-foldersFilipa Lacerda2016-11-191-22/+11
| | | | | |
| * | | | | Fix broken testFilipa Lacerda2016-11-191-0/+20
| | | | | |
| * | | | | Changes for stop url to pathFilipa Lacerda2016-11-191-16/+0
| | | | | |
| * | | | | Try to fix testsKamil Trzcinski2016-11-181-4/+5
| | | | | |
| * | | | | Bring back the `commit_url` as it's used by CycleAnalyticsKamil Trzcinski2016-11-181-0/+4
| | | | | |
| * | | | | Fix broken testsFilipa Lacerda2016-11-182-11/+11
| | | | | |
| * | | | | Merge branch '22539-display-folders' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-11-188-261/+175
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 22539-display-folders
| | * | | | | Swaps url for paths in mock dataFilipa Lacerda2016-11-171-11/+10
| | | | | | |
| | * | | | | Fix Rubocop offense for lines in environment specsGrzegorz Bizon2016-11-171-1/+0
| | | | | | |
| | * | | | | Merge branch 'master' into 22539-display-foldersGrzegorz Bizon2016-11-1718-130/+386
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) Remove extra subscribable_type filter on migration Add feature spec for labels subscription Avoid code duplication for label subscription status on label partial Rename LabelSubscription javascript to ProjectLabelSubscription Fix label subscription menu on small screens resolution Allow users to subscribe to a group label at group or project level Use button instead of an icon to subscribe/unsubscribe to labels Add CHANGELOG entry Add toggle_subscription action to Groups::LabelsController Allow subscriptions to be created without a project Use subqueries instead of joins to migrate subscriptions Add helper method to toggle label subscription on labels controller spec Remove default value for `project` argument on subscribable concern Use @project as default on ToggleSubscriptionAction concern Allow users to subscribe to group labels at project-level Pass project to Entities::Label to check if user is subscribed Fix specs to pass a project when creating subscriptions Refactoring label subscription toggle button text to accept a project Refactoring label subscription status to accept a project Refactoring notification service to find subscriptions per project ...
| | * \ \ \ \ \ Merge branch 'master' into 22539-display-foldersGrzegorz Bizon2016-11-1789-331/+1348
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (154 commits) Fix typos Fix wrong changelog item Add missing item for 8.13.6 Change last_used_at to use touch Add chat_name partial Mention Git strategy none Fix code review adds fix for security issue when annonymous user does not ... Remove ToC since it's now supported in the docs portal itself Add 8.14 to versions with further additions to review apps Add Limitations sections to environments and review apps docs Add link to environments docs Fix URL to review apps docs Add a prerequisites section, add some links Link to NGINX example project for the time being Get rid most of the irrelevant sections Add note about current limitation in $CI_BUILD_REF_NAME Add an intro and an Overview section for Review Apps WIP review apps Add Review apps link to CI README ... Conflicts: spec/features/environments_spec.rb
| | * | | | | | | Fix test case for environments related to deploymentsGrzegorz Bizon2016-11-171-7/+14
| | | | | | | | |