summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'replace_project_issues_award_emoji.feature' into 'master'Rémy Coutable2017-09-122-152/+0
|\ | | | | | | | | Replace the 'project/issues/award_emoji.feature' spinach test with an rspec analog See merge request !14202
| * Replace the 'project/issues/award_emoji.feature' spinach test with an rspec ↵Vitaliy @blackst0ne Klachkov2017-09-122-152/+0
| | | | | | | | analog
* | Replace the 'project/builds/summary.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-122-73/+0
|/
* Merge branch 'replace_project_merge_requests_revert.feature' into 'master'Rémy Coutable2017-09-122-85/+0
|\ | | | | | | | | Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog See merge request !14201
| * Replace the 'project/merge_requests/revert.feature' spinach test with an ↵Vitaliy @blackst0ne Klachkov2017-09-122-85/+0
| | | | | | | | rspec analog
* | Merge branch 'replace_milestone.feature' into 'master'Rémy Coutable2017-09-122-78/+0
|\ \ | |/ |/| | | | | Replace the 'project/milestone.feature' spinach test with an rspec analog See merge request !14171
| * Replace the project/milestone.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-122-78/+0
| |
* | Merge branch 'replace_project_merge_requests_accept.feature' into 'master'Rémy Coutable2017-09-112-83/+0
|\ \ | | | | | | | | | | | | Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog See merge request !14176
| * | Replace the 'project/merge_requests/accept.feature' spinach test with an ↵blackst0ne2017-09-112-83/+0
| |/ | | | | | | rspec analog
* | Merge branch 'replace_spinach_wiki.feature' into 'master'Rémy Coutable2017-09-112-296/+0
|\ \ | | | | | | | | | | | | Replace 'project/wiki.feature' spinach test with an rspec analog See merge request !13856
| * | Replace 'project/wiki.feature' spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-112-296/+0
| |/
* | Merge branch 'replace_group_links.feature' into 'master'Rémy Coutable2017-09-112-67/+0
|\ \ | | | | | | | | | | | | Replace 'project/group_links.feature' spinach test with an rspec analog See merge request !14169
| * | Replace project/group_links.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-102-67/+0
| |/
* | Merge branch 'replace_emails.feature' into 'master'Rémy Coutable2017-09-112-74/+0
|\ \ | | | | | | | | | | | | Replace the 'profile/emails.feature' spinach test with an rspec analog See merge request !14172
| * | Replace the profile/emails.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-102-74/+0
| |/
* | Replace the project/team_management.feature spinach test with an rspec analogVitaliy @blackst0ne Klachkov2017-09-102-113/+0
|/
* Resolve "Make project and features visibility settings less confusing"Mike Greiling2017-09-072-2/+1
|
* Merge branch '23079-remove-default-scope-in-sortable' into 'master'Douwe Maan2017-09-071-1/+1
|\ | | | | | | | | | | | | Removes default scope from sortable Closes #23079 See merge request !13558
| * Removes default scope from sortable23079-remove-default-scope-in-sortableTiago Botelho2017-09-071-1/+1
| |
* | Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-071-9/+4
|\ \ | | | | | | | | | | | | | | | | | | Finish migration to the new events setup Closes #37241 See merge request !13932
| * | Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-061-9/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | This finishes the procedure for migrating events from the old format into the new format. Code no longer uses the old setup and the database tables used during the migration process are swapped, with the old table being dropped. While the database migration can be reversed this will 1) take a lot of time as data has to be coped around 2) won't restore data in the "events.data" column as we have no way of restoring this. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37241
* | Merge branch 'fly-out-top-level-item' into 'master'Filipa Lacerda2017-09-073-4/+4
|\ \ | | | | | | | | | | | | | | | | | | Add top level items to fly-out navigation Closes #36294 See merge request !13981
| * | 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-063-5/+5
| |/ | | | | | | | | | | 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
* | fixed new issue button not being clicked in specbreadcrumbs-extra-btns-removePhil Hughes2017-09-071-1/+3
| |
* | fixed new milstone button not being visiblePhil Hughes2017-09-061-3/+1
| |
* | spec fixesPhil Hughes2017-09-065-5/+5
| |
* | Merge branch 'master' into breadcrumbs-improvementsPhil Hughes2017-09-061-0/+3
|\ \ | |/
| * Enable all gitaly features in spinach testsgitaly-spinachAlejandro Rodríguez2017-09-051-0/+3
| |
* | fixed up JS to use a js-* classPhil Hughes2017-09-062-3/+3
| | | | | | | | fixed up Ruby based on review
* | test fixesPhil Hughes2017-09-052-3/+3
|/ | | | removed un-used file
* 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
| | | | | | | | | | | |
View Lorry Controller Status