summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Move Dashboard shortcuts specs from Spinah to RSpecmove-dashboard-shortcuts-from-spinach-to-rspecRémy Coutable2017-01-312-28/+0
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Added labels empty state and priority label empty state20852-getting-started-project-better-blank-state-for-labels-viewLuke "Jared" Bennett2017-01-301-5/+4
| | | | | | Fixed delete labels not working Review changes
* Present TODO's list without grouping by projectOswaldo Ferreira2017-01-271-18/+27
|
* Merge branch 'rs-empty_project-for-associations' into 'master' Rémy Coutable2017-01-261-4/+3
|\ | | | | | | | | Factories with a project association use `:empty_project` by default See merge request !8770
| * Use a project factory with a repository where necessaryrs-empty_project-for-associationsRobert Speicher2017-01-251-4/+3
| |
* | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-251-2/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two cases that could be problematic: 1. Because sometimes AuthorizedProjectsWorker would be scheduled in a transaction it was possible for a job to run/complete before a COMMIT; resulting in it either producing an error, or producing no new data. 2. When scheduling jobs the code would not wait until completion. This could lead to a user creating a project and then immediately trying to push to it. Usually this will work fine, but given enough load it might take a few seconds before a user has access. The first one is problematic, the second one is mostly just annoying (but annoying enough to warrant a solution). This commit changes two things to deal with this: 1. Sidekiq scheduling now takes places after a COMMIT, this is ensured by scheduling using Rails' after_commit hook instead of doing so in an arbitrary method. 2. When scheduling jobs the calling thread now waits for all jobs to complete. Solution 2 requires tracking of job completions. Sidekiq provides a way to find a job by its ID, but this involves scanning over the entire queue; something that is very in-efficient for large queues. As such a more efficient solution is necessary. There are two main Gems that can do this in a more efficient manner: * sidekiq-status * sidekiq_status No, this is not a joke. Both Gems do a similar thing (but slightly different), and the only difference in their name is a dash vs an underscore. Both Gems however provide far more than just checking if a job has been completed, and both have their problems. sidekiq-status does not appear to be actively maintained, with the last release being in 2015. It also has some issues during testing as API calls are not stubbed in any way. sidekiq_status on the other hand does not appear to be very popular, and introduces a similar amount of code. Because of this I opted to write a simple home grown solution. After all, all we need is storing a job ID somewhere so we can efficiently look it up; we don't need extra web UIs (as provided by sidekiq-status) or complex APIs to update progress, etc. This is where Gitlab::SidekiqStatus comes in handy. This namespace contains some code used for tracking, removing, and looking up job IDs; all without having to scan over an entire queue. Data is removed explicitly, but also expires automatically just in case. Using this API we can now schedule jobs in a fork-join like manner: we schedule the jobs in Sidekiq, process them in parallel, then wait for completion. By using Sidekiq we can leverage all the benefits such as being able to scale across multiple cores and hosts, retrying failed jobs, etc. The one downside is that we need to make sure we can deal with unexpected increases in job processing timings. To deal with this the class Gitlab::JobWaiter (used for waiting for jobs to complete) will only wait a number of seconds (30 by default). Once this timeout is reached it will simply return. For GitLab.com almost all AuthorizedProjectWorker jobs complete in seconds, only very rarely do we spike to job timings of around a minute. These in turn seem to be the result of external factors (e.g. deploys), in which case a user is most likely not able to use the system anyway. In short, this new solution should ensure that jobs are processed properly and that in almost all cases a user has access to their resources whenever they need to have access.
* Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-205-12/+12
|\ | | | | | | | | Moved the webhooks and services gear options to a single one called integrations See merge request !8380
| * Fixed more testsJose Ivan Vargas2017-01-182-7/+7
| |
| * Fixed spinach feature tests for the services and hooks controllersJose Ivan Vargas2017-01-183-5/+5
| | | | | | | | Added a test for the integrations controller
* | Merge branch ↵Fatih Acet2017-01-191-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | '24032-changed-visibility-level-to-public-but-project-is-not-public' into 'master' Update project visibility level ui to use dropdowns Closes #24296, #24123, and #24032 See merge request !7645
| * Fixed tests24032-changed-visibility-level-to-public-but-project-is-not-publicLuke "Jared" Bennett2016-12-101-1/+1
| | | | | | | | | | | | | | | | Grab permissions description from backend Review changes Added unit tests
* | Remove repository trait from factories that don't need it in featuresrs-repository-project-traitRobert Speicher2017-01-178-13/+13
| |
* | Add the `:repository` trait to `:project` factories in Cucumber stepsRobert Speicher2017-01-1719-33/+33
| |
* | Merge branch 'move-admin-groups-spinach-test-to-rspec' into 'master' Rémy Coutable2017-01-153-196/+0
|\ \ | | | | | | | | | | | | Move admin groups spinach tests to rspec See merge request !8313
| * | Move admin groups spinach tests to rspecSemyon Pupkov2016-12-273-196/+0
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | Merge branch 'move-dashboard-help-spinach-to-rspec' into 'master' Rémy Coutable2017-01-132-30/+0
|\ \ \ | | | | | | | | | | | | | | | | Move dashboard help spinach test to rspec See merge request !8436
| * | | Move dashboard help spinach test to rspecSemyon Pupkov2017-01-042-30/+0
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Merge branch 'move-dashboard-group-spinach-to-rspec' into 'master' Rémy Coutable2017-01-132-38/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move dashboard group spinach test to rspec See merge request !8434
| * | | | Move dashboard group spinach test to rspecSemyon Pupkov2017-01-042-38/+0
| |/ / / | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Merge branch 'move-dashboard-archived-projects-spinach-to-rspec' into 'master' Rémy Coutable2017-01-132-43/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move dashboard archived projects spinach tests to rspec See merge request !8431
| * | | | Move dashboard archived projects spinach tests to rspecSemyon Pupkov2017-01-042-43/+0
| |/ / / | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Merge branch 'move-dashboard-activetab-spinach-to-rspec' into 'master' Rémy Coutable2017-01-132-29/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move dashboard active tab spinach test to rspec See merge request !8423
| * | | | Move dashboard active tab spinach test to rspecSemyon Pupkov2017-01-032-29/+0
| |/ / / | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Merge branch 'move-admin-users-spinach-tests-to-rspec' into 'master' Rémy Coutable2017-01-132-232/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move admin users spinach tests to rspec See merge request !8395
| * | | | Move admin users spinach tests to rspecSemyon Pupkov2017-01-022-232/+0
| |/ / / | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Fix spinach testsClement Ho2017-01-092-84/+0
| | | |
* | | | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-061-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the members and groups to single option called members Closes #25985 See merge request !8281
| * | | | Fixed more rspec tests as well as spinach featuresJose Ivan Vargas2017-01-031-2/+4
| |/ / /
* | | | Move admin deploy keys spinach to rspecSemyon Pupkov2017-01-032-82/+0
|/ / /
* | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-272-0/+82
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Allow to add deploy keys with write-access Closes #1376 See merge request !7383
| * | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-2020-786/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (538 commits) Reject blank environment vcariables in Gitlab::Git::RevList Add online terminal documentation Add changelog entry Add terminal UI and controller actions Fix specs Even out padding on plus button in breadcrumb menu Update font size of detail page header to 14px Update CHANGELOG.md for 8.13.10 Update CHANGELOG.md for 8.14.5 Fix Route#rename_children behavior Remove inline-block styling from status Add terminals to the Kubernetes deployment service Add a ReactiveCaching concern for use in the KubernetesService Add xterm.js 2.1.0 and a wrapper class to the asset pipeline Remove unnecessary hidden svg elements for icons. Fix consistent typo in environment.js Use a block to insert extra check for authenticate_build! Align milestone column header with count number Add Wiki import to BB importer Make CI badge hitboxes better match container ...
| * \ \ Merge CSSFilipa Lacerda2016-12-127-47/+13
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-12-0616-135/+33
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/1376-allow-write-access-deploy-keys * upstream/master: (488 commits) Merge branch 'issue_25064' into 'security' It's secret variables, not secure Fix dead links, add example of debug trace output, simplify titles Authorize users into imported GitLab project Document button secondary states. Update icons and color section Remove unused votes.scss Remove unused errors css Fixed MR widget content wrapping for XS viewports NIGNX -> Nginx Use pry-byebug instead byebug Fixed influence from other specs. Accept `issue new` as command to create an issue Update paranoia from 2.1.4 to 2.2.0. Use the pagination helper in the API Added changelog for #25221 Fixed top margin for Builds page status header information Satisfied eslint Fix compatibility with Internet Explorer 11 for merge requests change the date label to match the date used fix gfm doc typo about two spaces for next line transfer ...
| * | | | Allow admin to set keys with write access, andLin Jen-Shin2016-11-222-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | show write access information when showing the key. TODO: It's ugly right now, need help!
* | | | | Changes after reviewFilipa Lacerda2016-12-212-11/+0
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix broken test Remove spinach tests for the builds tab
* | | | Merge branch 'move-admin-projects-spinach-tests-to-rspec' into 'master' Rémy Coutable2016-12-202-151/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin projects spinach tests to RSpec Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23036 See merge request !8174
| * | | | Move admin projects spinach tests to rspecSemyon Pupkov2016-12-192-151/+0
| | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | Merge branch 'zj-kamil-slack-slash-commands' into 'master' Grzegorz Bizon2016-12-202-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slack slash commands ## What does this MR do? Implement Slack Slash Commands by utilizing generalized Mattermost presenter to fulfill Slack requirements. ## Why was this MR needed? We want to expose Slack Slash Commands as a first-class service. ## What are the relevant issue numbers? Supersedes !8007 Closes #22182 See merge request !8126
| * | | | | Fix specszj-kamil-slack-slash-commandsKamil Trzcinski2016-12-192-6/+6
| | | | | |
| * | | | | Improve after feedbackKamil Trzcinski2016-12-192-7/+7
| | | | | |
* | | | | | Merge branch 'move-admin-appearance-feature-to-rspec' into 'master' Rémy Coutable2016-12-193-113/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Admin Appearance spinach feature to RSpec Part of #23036 See merge request !8063
| * | | | | | Move Admin Appearance spinach feature to rspecjurre2016-12-193-113/+0
| | | | | | |
* | | | | | | Move admin broadcast messages spinach feature to rspecjurre2016-12-192-99/+0
|/ / / / / /
* | | | | | Merge branch 'move-admin-label-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-192-155/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin labels spinach test to RSpec Part of #23036 See merge request !8166
| * | | | | Move admin labels spinach test to rspecSemyon Pupkov2016-12-192-155/+0
| |/ / / / | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | Merge branch 'move-admin-application-spinach-test-to-rspec' into 'master' Rémy Coutable2016-12-193-77/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move admin application spinach test to RSpec Part of #23036 See merge request !8140
| * | | | | Move admin application spinach test to rspecSemyon Pupkov2016-12-173-77/+0
| |/ / / / | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | | Move admin deploy keys spinach test to rspecSemyon Pupkov2016-12-172-62/+0
|/ / / / | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Merge branch 'move-admin-active-tab-spinach-tests-to-rspec' into 'master' Rémy Coutable2016-12-152-95/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move admin active tab spinach tests to RSpec See merge request !8037
| * | | | Move admin active tab spinach tests to rspecSemyon Pupkov2016-12-122-95/+0
| | |_|/ | |/| | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
View Lorry Controller Status