summaryrefslogtreecommitdiff
path: root/features/steps/shared
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 22643-manual-job-pageFilipa Lacerda2018-01-042-12/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (200 commits) Fix issue boards scroll config. Added multi editor setting on the profile preferences page fix missing import of timeWeek which would cause errors in prometheus graphs with deployments Remove downcase from special path helper Rename db:seed_fu-{pg,mysql} to gitlab:setup-{pg,mysql} Fix error when viewing diffs without blobs Moves prettier to dev dependency Eager load event target authors whenever possible Do not run ee_compat_check on security branches Include integration tests in CE/EE testing documentation 41054-Disallow creation of new Kubernetes integrations Resolve "Resizable file list and commit panel" Make tooltip placement bottom by default as per design guidelines Fix groups list icon, timestamp alignment and row height Avoid leaving a push event empty if payload cannot be created Move git operations for UpdateRemoteMirrorService into Gitlab::Git Move delete_remote_branches from Gitlab::Shell to Gitlab::Git::Repository Move push_remote_branches from Gitlab::Shell to Gitlab::Git::Repository Update Kubernetes service documentation fix issue #37843 ...
| * Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-222-12/+11
| |
* | Fix broken spinach testFilipa Lacerda2017-12-211-1/+1
|/
* Add js prefix for issuable-editadd-js-prefix-issuable-editClement Ho2017-12-081-1/+1
|
* Rename artifacts_* to legacy_artifacts_*Kamil Trzcinski2017-12-031-2/+2
|
* Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-231-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (297 commits) Fix deletion of container registry or images returning an error The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix: Decrease ABC threshold to 54.28 Update VERSION to 10.2.0-pre Update CHANGELOG.md for 10.1.0 Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` Fix the external URLs generated for online view of HTML artifacts Use title as placeholder instead of issue title for reusability Fix failure in current_settings_spec.rb Clarify the difference between project_update and project_rename URI decode Page-Title header to preserve UTF-8 characters Update Gitaly version to v0.49.0 Decrease Perceived Complexity threshold to 14 Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)" Force non diff resolved discussion to display when collapse toggled Added submodule support in multi-file editor add note about after_script being run separately Check for element before evaluate_script Merge branch 'master-i18n' into 'master' Update Prometheus gem to fix problems with other files overwriting current file ...
| * Merge branch 'not-found-in-commits' into 'master'Douwe Maan2017-10-191-1/+1
| |\ | | | | | | | | | | | | | | | | | | Renders 404 in commits controller if no commits are found Closes #37620 See merge request gitlab-org/gitlab-ce!14610
| | * Renders 404 in commits controller if no commits are foundGuilherme Vieira2017-10-181-1/+1
| | |
* | | Merge branch 'master' into sh-headless-chrome-supportMike Greiling2017-10-122-31/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (104 commits) Update licenses fix a wrong method call in the refactor fix a whitespace fix for discussion Update templates via: Update doc accordingly to: Cache issuable template names Fix the format of rugged alternate directory list Match full file path in FileDetector Fixes from CSS refactor Resolve "Prometheus service page shows error" Explicit state integration deletion Move all API authentication code to APIGuard Shorten example translation for inclusive language [ci-skip] add changelog fix the merger override to remove source branch add spec Removed d3.js from the users and graphs bundle Cleanup data-page attribute after each Karma test Update template description wording ...
| * | Replace the 'features/explore/projects.feature' spinach test with an rspec ↵replace_explore_projects.featureVitaliy @blackst0ne Klachkov2017-10-112-31/+0
| | | | | | | | | | | | analog
* | | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-10-031-0/+1
|\ \ \ | |/ /
| * | Only copy old/new code when selecting left/right side of parallel diffdm-copy-parallel-diffDouwe Maan2017-10-021-1/+1
| |/
* | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-09-261-6/+6
|\ \ | |/
| * Improve list of sorting optionsVitaliy @blackst0ne Klachkov2017-09-231-6/+6
| |
* | Merge branch 'master' into sh-headless-chrome-supportJose Ivan Vargas2017-09-132-3/+3
|\ \ | |/
| * Resolve "Make project and features visibility settings less confusing"Mike Greiling2017-09-071-1/+1
| |
| * fixed spinach specsfly-out-top-level-itemPhil Hughes2017-09-061-1/+1
| |
| * spec fixesPhil Hughes2017-09-061-1/+1
| |
| * Add top level items to fly-out navigationPhil Hughes2017-09-061-3/+3
| | | | | | | | | | | | This only appears when in the collapsed sidebar. If the sidebar is expanded, then these items are hidden & no fly-out navigation is displayed. Closes #36294
* | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-09-054-10/+13
|\ \ | |/
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJose Ivan Vargas2017-09-033-7/+12
| |\
| | * Merge branch 'issue-discussions-refactor' into 'master'Jacob Schatz2017-09-021-1/+6
| | |\ | | | | | | | | | | | | | | | | Issue discussions Vue refactor See merge request !12069
| | | * Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-301-4/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb
| | | * \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-171-5/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json # spec/support/features/reportable_note_shared_examples.rb
| | | * \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-121-22/+8
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (66 commits) fix confidential border issue as well as confidential styles leaking on new MR Migrate force push check to Gitaly Add option to disable project export on instance Better categorize test coverage results Add option to disable project export on instance - db changes Better caching and indexing of broadcast messages Include the `is_admin` field in the `GET /users/:id` API when current user is an admin Document rspec-retry and rspec-flaky Fix cop description Retrieve and sync flaky specs report from and to S3 Use a new RspecFlakyListener to detect flaky specs Fix formatting of patch_versions.md [skip ci] Enable Timecop safe mode Show error message for API 500 error in tests, and Fix merge request diff deserialisation when too_large was absent Delete correct key from `session` after authenticating using U2F Bumps omniauth-ldap gem version to 2.0.4 Pending delete projects no longer return 500 error in Admins projects view Do not run the `ee_compat_check` job for stableish branches Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb. ...
| | | * | | | Fix open discussionsFilipa Lacerda2017-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Put back deleted tests
| | | * | | | Fix broken testsFilipa Lacerda2017-08-101-2/+5
| | | | | | |
| | | * | | | Remove forgotten fdescribeFilipa Lacerda2017-08-101-0/+2
| | | | | | |
| | * | | | | more spinach fixesPhil Hughes2017-08-301-1/+1
| | | | | | |
| | * | | | | spinach test updatesPhil Hughes2017-08-301-1/+1
| | | | | | |
| | * | | | | layout-nav test check fixPhil Hughes2017-08-291-4/+4
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch '36743-existing-repo-master' into 'master'Douwe Maan2017-08-311-3/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | [master] Prevent project creation (blank, import or fork) when repository already exists on disk See merge request gitlab/gitlabhq!2169
| | * | | | Prevent new / renamed project from using a repository path that already ↵Gabriel Mazetto2017-08-251-3/+1
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exists on disk There are some redundancies in the validation steps, and that is to preserve current error messages behavior Also few specs have to be changed in order to fix madness in validation logic.
* | | | | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-08-311-4/+0
|\ \ \ \ \ | |/ / / /
| * | | | Replace 'source/search_code.feature' spinach test with an rspec analogblackst0ne2017-08-251-4/+0
| |/ / /
* | | | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-08-161-5/+2
|\ \ \ \ | |/ / /
| * | | Merge branch ↵Clement Ho2017-08-141-5/+2
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | '34527-make-edit-comment-button-always-available-outside-of-dropdown' into 'master' Resolve "Make edit comment button always available outside of dropdown" Closes #34527 See merge request !12931
| | * | take edit note button out of dropdown34527-make-edit-comment-button-always-available-outside-of-dropdownSimon Knox2017-08-101-5/+2
| | |/
* | | Accept the confirm modal to make comment on commit spec to passStan Hu2017-08-131-1/+1
| | |
* | | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-08-111-22/+8
|\ \ \ | |/ /
| * | Migrate events into a new formatYorick Peterse2017-08-101-22/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit migrates events data in such a way that push events are stored much more efficiently. This is done by creating a shadow table called "events_for_migration", and a table called "push_event_payloads" which is used for storing push data of push events. The background migration in this commit will copy events from the "events" table into the "events_for_migration" table, push events in will also have a row created in "push_event_payloads". This approach allows us to reclaim space in the next release by simply swapping the "events" and "events_for_migration" tables, then dropping the old events (now "events_for_migration") table. The new table structure is also optimised for storage space, and does not include the unused "title" column nor the "data" column (since this data is moved to "push_event_payloads"). == Newly Created Events Newly created events are inserted into both "events" and "events_for_migration", both using the exact same primary key value. The table "push_event_payloads" in turn has a foreign key to the _shadow_ table. This removes the need for recreating and validating the foreign key after swapping the tables. Since the shadow table also has a foreign key to "projects.id" we also don't have to worry about orphaned rows. This approach however does require some additional storage as we're duplicating a portion of the events data for at least 1 release. The exact amount is hard to estimate, but for GitLab.com this is expected to be between 10 and 20 GB at most. The background migration in this commit deliberately does _not_ update the "events" table as doing so would put a lot of pressure on PostgreSQL's auto vacuuming system. == Supporting Both Old And New Events Application code has also been adjusted to support push events using both the old and new data formats. This is done by creating a PushEvent class which extends the regular Event class. Using Rails' Single Table Inheritance system we can ensure the right class is used for the right data, which in this case is based on the value of `events.action`. To support displaying old and new data at the same time the PushEvent class re-defines a few methods of the Event class, falling back to their original implementations for push events in the old format. Once all existing events have been migrated the various push event related methods can be removed from the Event model, and the calls to `super` can be removed from the methods in the PushEvent model. The UI and event atom feed have also been slightly changed to better handle this new setup, fortunately only a few changes were necessary to make this work. == API Changes The API only displays push data of events in the new format. Supporting both formats in the API is a bit more difficult compared to the UI. Since the old push data was not really well documented (apart from one example that used an incorrect "action" nmae) I decided that supporting both was not worth the effort, especially since events will be migrated in a few days _and_ new events are created in the correct format.
* | Expand Spinach window size and remove unsupported trigger callsStan Hu2017-08-111-2/+0
| |
* | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-08-091-3/+3
|\ \ | |/
| * Merge branch '34060-simplified-general-project-settings' into 'master'Mike Greiling2017-08-041-1/+1
| |\ | | | | | | | | | | | | | | | | | | 34060 Simply general project settings to use expanded panels Closes #34060 See merge request !12620
| | * fixed up specsPhil Hughes2017-07-281-1/+1
| | |
| * | Change all `:empty_project` to `:project`rs-empty_project-defaultRobert Speicher2017-08-021-3/+3
| | |
| * | Use `:empty_project` where possible in features/stepsRobert Speicher2017-08-021-1/+1
| |/
* | Merge branch 'master' into sh-headless-chrome-supportStan Hu2017-08-027-139/+67
|\ \ | |/
| * Replaces dashboard/dashboard.feature spinach with rspecAlexander Randa2017-07-171-5/+0
| |
| * Resolve "Inconsistent location of members page between groups and projects"Tim Zallmann2017-07-071-0/+4
| |