summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Enable all gitaly features in spinach testsgitaly-spinachAlejandro Rodríguez2017-09-051-0/+3
|
* Merge branch ↵Kamil Trzciński2017-09-041-1/+2
|\ | | | | | | | | | | | | | | | | 'feature/sm/33281-protected-runner-executes-jobs-on-protected-branch' into 'master' Protected runner executes jobs on protected branch [Solution 1] Closes #33281 See merge request !13194
| * Fix specShinya Maeda2017-09-031-1/+2
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJose Ivan Vargas2017-09-0314-27/+37
|\ \ | |/
| * Merge branch 'issue-discussions-refactor' into 'master'Jacob Schatz2017-09-022-1/+7
| |\ | | | | | | | | | | | | Issue discussions Vue refactor See merge request !12069
| | * Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-312-65/+0
| | |\
| | * \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-307-118/+8
| | |\ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb
| | * \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-08-173-9/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 open discussionsFilipa Lacerda2017-08-111-0/+1
| | | | | | |
| | * | | | | Fix broken testsFilipa Lacerda2017-08-101-2/+5
| | | | | | |
| | * | | | | Remove forgotten fdescribeFilipa Lacerda2017-08-102-0/+3
| | | | | | |
| | * | | | | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-081-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (481 commits) Make sure that we have author and committer disable file upload button while uploading Fix bar chart does not display label at hour 0 Fixed activity not loading on project homepage Expose noteable_iid in Note Fix fly-out width when it has long items Add a test to show that threshold 40 would corrupt Add changelog entry Raise encoding confidence threshold to 50 Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name when the project full path contains a `/` Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name when the project full path contains a `/` Add Italian translations of Pipeline Schedules Restrict InlineJavaScript for haml_lint to dev and test environment Incorporate Gitaly's CommitService.FindCommit RPC Move `deltas` and `diff_from_parents` logic to Gitlab::Git::Commit fix repo_edit_button_spec.js fix test failures in repo_preview_spec.js fix repo_loading_file_spec tests Refactor Gitlab::Git::Commit to include a repository use 100vh instead of flip flopping between the two - works on all suported browsers ...
| | * \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-042-5/+13
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix pipeline icon in contextual nav for projects fixed up specs trying to fix tests fix merge conflicts css fixes try and fix some tests 34060 Simply general project settings to use expanded panels
| | * \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-047-12/+12
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (162 commits) Since mysql is not a priority anymore, test it less Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Install yarn via apt in update guides Use long curl options Remove monkey-patched Array.prototype.first() and last() methods Openshift Getting Started 35659 Rename Pipelines tab to CI / CD in new navigation Don't bother going through an entire Banzai pipeline for empty text Add active state for pipelines settings on old nav Bump rspec to 3.6.0 Resolve "Specific Async Script Loading by using a Page Variable" Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'" another rubocop style fix Use mixin for new dropdown style Migrate Repository#last_commit_for_path to Gitaly Migrate blame loading to Gitaly ...
| | * \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-013-9/+9
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) Add code review guidelines related to Build [CI skip]. Make time span dropdown style on cycle analytics page consistent Add 204. Remove duplicated method. Make sure we didn't commit conflicts Fix bug in blob test Always fetch branches before finding the merge base, otherwise we could find an outdated merge base Fixes dropdown margin in sidebar Docs add blog articles Inline script cleanup globals and easy Add option to use CommitLanguages RPC CI fixes for gitaly-ruby fix Allow logged in users to read user list under public restriction Small refactor in LegacyNamespace and moved back send_update_instructions Rename ensure_dir_exist -> ensure_storage_path_exist Added some extra TODOs for the Legacy Storage refactor Make disk_path keyword argument and optional Rename more path_with_namespace -> full_path or disk_path Rename path_with_namespace -> disk_path when dealing with the filesystem Rename many path_with_namespace -> full_path ...
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-07-314-62/+2
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/concerns/notes_actions.rb # spec/features/task_lists_spec.rb # spec/support/features/issuable_slash_commands_shared_examples.rb
| | * | | | | | | | | | IssueNotesRefactor: Fix issue spinach tests.Fatih Acet2017-07-211-1/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into enable-new-navigaton-by-defaultenable-new-navigaton-by-defaultPhil Hughes2017-08-304-141/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | more navigation spec fixesPhil Hughes2017-08-302-5/+5
| | | | | | | | | | | |
| * | | | | | | | | | | more spinach fixesPhil Hughes2017-08-303-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | spinach test updatesPhil Hughes2017-08-309-16/+20
| | | | | | | | | | | |
| * | | | | | | | | | | 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 'replace_spinach_user_lookup.feature' into 'master'Robert Speicher2017-08-302-65/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'project/user_lookup.feature' spinach test with an rspec analog See merge request !13863
| * | | | | | | | | | Replace 'project/user_lookup.feature' spinach test with an rspec analogblackst0ne2017-08-302-65/+0
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Replace 'project/star.feature' spinach test with an rspec analogblackst0ne2017-08-302-76/+0
|/ / / / / / / / /
* | | | | | | | | Merge branch 'replace_spinach_search_code.feature' into 'master'Robert Speicher2017-08-253-38/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'source/search_code.feature' spinach test with an rspec analog See merge request !13697
| * | | | | | | | | Replace 'source/search_code.feature' spinach test with an rspec analogblackst0ne2017-08-253-38/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'zj-reword-job-to-pipeline-chart-view' into 'master'Douwe Maan2017-08-251-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reword job to pipeline on the chart view Closes #36928 See merge request !13786
| * | | | | | | | | Reword job to pipeline on the chart viewZeger-Jan van de Weg2017-08-241-3/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This got changed for i18n in !12480, however, I forgot to understand that the meaning of the graphs changed in !12378. This corrects the behaviour.
* | | | | | | | | Fix feature specs for pages deploymentbackstage/gb/after-save-asynchronous-job-hooksGrzegorz Bizon2017-08-231-1/+5
|/ / / / / / / /
* | | | | | | | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-151-1/+1
| | | | | | | |
* | | | | | | | Merge branch ↵Clement Ho2017-08-142-8/+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-102-8/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | 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.
* | | | | | Merge branch 'wiki_title' into 'master'Robert Speicher2017-08-071-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | add feature rename wiki title Closes #27800 See merge request !10069
| * | | | | Allow wiki pages to be renamed in the UIwendy04022017-08-031-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch '34060-simplified-general-project-settings' into 'master'Mike Greiling2017-08-042-5/+13
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 34060 Simply general project settings to use expanded panels Closes #34060 See merge request !12620
| * | | | fixed up specsPhil Hughes2017-07-282-5/+13
| | |_|/ | |/| |
* | | | Change all `:empty_project` to `:project`rs-empty_project-defaultRobert Speicher2017-08-028-14/+14
| | | |
* | | | Use `:empty_project` where possible in features/stepsRobert Speicher2017-08-022-2/+2
| |/ / |/| |
* | | Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-013-9/+9
|/ /
* | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Prevent concurrent editing wiki Closes #1827 See merge request !9707
| * | Fix error of spinach testHiroyuki Sato2017-07-231-1/+1
| | |
* | | Remove project_key from the Jira configurationJarka Kadlecova2017-07-251-1/+0
| | |
* | | Resolve "Lazy load images on the Frontend"Tim Zallmann2017-07-241-1/+1
|/ /
* | Port spinach tests to rspec feature specszj-pipeline-badge-improvementsZ.J. van de Weg2017-07-212-59/+0
| | | | | | | | | | | | | | Logic is the same, just now ported, while this feature was being improved anyway in this branch. Resolves #20961