Commit Graph

74 Commits

Author SHA1 Message Date
Annabel Dunstone Gray a2e2b11cf5
Fix merge_request_spec 2017-11-07 10:27:20 -07:00
Mike Greiling 2304550b43
fix flaky fill_in use in which return key would occasionally be intercepted by autocomplete 2017-11-01 14:03:53 -05:00
Mike Greiling 519ffa1ebf
Merge branch 'master' into sh-headless-chrome-support
* 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
  ...
2017-10-23 10:32:14 +03:00
Clement Ho 04b616a60e Force non diff resolved discussion to display when collapse toggled 2017-10-20 10:40:26 +00:00
Mike Greiling c489b23708
fix shared discussion_comments examples (for realz this time!) 2017-10-13 13:48:48 -05:00
Jose Ivan Vargas e118e3cdaa fixed shared discussion_comments example 2017-10-10 15:57:21 -05:00
Mike Greiling 85b915c39b
fix click trigger method 2017-10-10 15:43:05 -05:00
Mike Greiling f783798825
Merge branch 'master' into sh-headless-chrome-support
* master: (113 commits)
  Introduce new hook data builders for Issue and MergeRequest
  Don't create todos for old issue assignees
  Start adding Gitlab::HookData::IssuableBuilder
  Include the changes in issuable webhook payloads
  Rename the `codeclimate` job to `codequality`
  Don't show an "Unsubscribe" link in snippet comment notifications
  Add QA::Scenario::Gitlab::Group::Create
  Removes CommitsList from global namespace
  Fix wiki empty page translation namespace not being removed
  Fixes mini graph in commit view
  Fix link to new i18n index page
  Update i18n docs
  Move i18n/introduction to i18n/index
  Resolve "Simple documentation update - backup to restore in restore section"
  Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespace
  Move cycle analytics banner into a vue file
  Updated Icons + Fix for Collapsed Groups Angle
  Don't create fork networks for root projects that are deleted
  Remove executable permissions on images to make docs lint happy
  Sync up hard coded DN class in migration
  ...
2017-10-09 15:00:00 -05:00
Jacopo 0ce6785851 Replaces `tag: true` into `:tag` in the specs
Replaces all the explicit include metadata syntax in the specs (tag:
true) into the implicit one (:tag).
Added a cop to prevent future errors and handle autocorrection.
2017-10-07 13:57:54 +02:00
Felipe Artur b54203f0ad Commenting on image diffs 2017-10-07 04:25:17 +00:00
Jose Ivan Vargas 2d58626a33 Changed helper methods to use the click method 2017-09-12 16:43:28 -05:00
Stan Hu 41e5ec8f74 Merge branch 'master' into sh-headless-chrome-support 2017-09-05 11:33:09 -07:00
Stan Hu f045903541 Merge branch 'master' into sh-headless-chrome-support 2017-08-31 20:50:05 -07:00
Douwe Maan b181d3124e Merge branch 'master' into issue-discussions-refactor
# Conflicts:
#	app/models/issue.rb
2017-08-30 10:14:56 +02:00
Fatih Acet e5c8d2ca51 IssueNotesRefactor: Fix broken specs. 2017-08-29 02:39:07 +03:00
Simon Knox bcd2135e08 fix transient test failures caused by wrong dropdown trigger 2017-08-28 16:38:26 +10:00
Douwe Maan 834f1b30d5 Merge branch 'master' into issue-discussions-refactor
# Conflicts:
#	package.json
#	spec/support/features/reportable_note_shared_examples.rb
2017-08-17 14:01:31 +02:00
Stan Hu d3e8167382 Merge branch 'master' into sh-headless-chrome-support 2017-08-16 00:48:48 -07:00
Jarka Kadlecova b67e333ce8 fix static_analysis (rubocop) 2017-08-14 07:15:52 +02:00
Filipa Lacerda 60adf5a93a Update dropdown tests to match bootstrap one on issue page and droplab on other pages 2017-08-12 23:38:45 +01:00
Filipa Lacerda dff60db28d Look for a button on issues 2017-08-12 23:38:25 +01:00
Filipa Lacerda 1852dfa3ae Adds type for shared note specs 2017-08-12 21:15:48 +01:00
Filipa Lacerda ab88fcf117 Uncomments tests 2017-08-12 00:14:45 +01:00
Jarka Kadlecova 345df20870 Fix specs - delete comment is now a button instead of simple link 2017-08-11 17:26:43 +02:00
Simon Knox 8858ddaf83 take edit note button out of dropdown 2017-08-10 09:37:25 +10:00
Stan Hu 09baadca34 Merge branch 'master' into sh-headless-chrome-support 2017-08-09 15:57:52 -07:00
Filipa Lacerda 23334ac0a1 Merge branch 'master' into issue-discussions-refactor
* 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
  ...
2017-08-08 16:15:16 +01:00
Mehdi Lahmam 5ad9d94d8e Add `/assign me` alias support for assigning issuables to oneself
Currently, when a user wants to assign an issue/MR to himself, he needs
to type his full username or select it from the suggested ones in the
dropdown list.
This commits suggest a faster solution which is typing `/assign me`

Closes #35304.
2017-08-07 14:40:33 +02:00
Filipa Lacerda e4f8aa719b Merge branch 'master' into issue-discussions-refactor
* 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
  ...
2017-08-04 19:38:37 +01:00
Stan Hu 408df2edcb Merge branch 'master' into sh-headless-chrome-support 2017-08-02 16:58:28 -07:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Robert Speicher 9513bd18c4 Ensure all project factories use `:repository` trait or `:empty_project` 2017-08-01 14:51:52 -04:00
Douwe Maan 95f9d6d83b Merge branch 'master' into issue-discussions-refactor
# Conflicts:
#	app/controllers/concerns/notes_actions.rb
#	spec/features/task_lists_spec.rb
#	spec/support/features/issuable_slash_commands_shared_examples.rb
2017-07-31 10:23:50 +02:00
Fatih Acet 99b82a0716 IssueNotesRefactor: Use `gitlab_` prefixed auth helpers. 2017-07-22 02:59:25 +03:00
Robert Speicher c10943d9cc Create guest users only when necessary rather than for every spec
These are two examples of a top-level `before` block doing too much.
Only specific specs cared about these guest users, but we were creating
them and their `ProjectMember` records for every single spec that ran.
2017-07-21 17:11:02 -04:00
Fatih Acet 8fa1f65e71 IssueNotesRefactor: Fix invalid tests. 2017-07-22 00:10:56 +03:00
Fatih Acet 6c3723d2d3 IssueNotesRefactor: Fix shared spec. 2017-07-21 22:35:26 +03:00
Fatih Acet d493c16fb1 IssueNotesRefactor: Fix reportable spec. 2017-07-21 22:35:26 +03:00
Fatih Acet 3c946b932b IssueNotesRefactor: Fix Rspec tests. 2017-07-21 22:35:26 +03:00
Robert Speicher 204f4c5c15 Change gitlab_sign_out to sign_out where possible 2017-06-29 12:18:23 -04:00
Robert Speicher e939bf7be1 Change gitlab_sign_in to sign_in where possible 2017-06-29 12:18:23 -04:00
Douwe Maan 70b05a8377 Split up MergeRequestsController 2017-06-28 18:17:44 -05:00
Stan Hu 0f943c941b Merge branch 'master' into sh-headless-chrome-support 2017-06-21 09:43:58 -07:00
Douwe Maan d9d020b169 Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'
Only show 'Edit comment'/'Report as abuse' when user has perms/isnt current_user

See merge request !12096
2017-06-20 16:04:46 +00:00
Luke "Jared" Bennett 1f9fb9e457
Remove PersonalSnippet case for reportable_note specs 2017-06-20 09:03:04 +01:00
Robert Speicher 044f09d807 Change `logout` uses to `gitlab_sign_out`
Change `logout_direct` uses to `gitlab_sign_out_direct`
2017-06-19 18:59:02 -05:00
Robert Speicher 018ed2c42f Change `login_with` uses to `gitlab_sign_in`
Change single `login_via` use to `gitlab_sign_in_via`
2017-06-19 18:59:01 -05:00
Stan Hu 5854ab2f7d Convert variants of trigger('click') -> click 2017-06-16 23:08:27 -07:00
Luke "Jared" Bennett f50a806531
Fixed reportable_note_shared_example for the reportable_note/snippets_spec 2017-06-16 13:57:03 +01:00
Eric Eastwood ea090291bb Rename "Slash commands" to "Quick actions"
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070

Deprecate "chat commands" in favor of "slash commands"

We looked for things like:

 - `slash commmand`
 - `slash_command`
 - `slash-command`
 - `SlashCommand`
2017-06-15 09:01:56 -05:00