Commit Graph

108 Commits

Author SHA1 Message Date
Oswaldo Ferreira 86ead874e2 Resolve "Filter discussion (tab) by comments or activity in issues and merge requests" 2018-10-23 09:49:45 +00:00
Sean McGivern c1667dea04 Fix issues controller N+1 failure
EE needs :request_store to cache license queries - otherwise we will
blow past the query limit just with `SELECT * FROM licenses` over and
over.
2018-10-05 11:55:34 +01:00
Mario de la Ossa 7cb2755617
Banzai project ref- share context more aggresively
Changes `Banzai::CrossProjectReference#parent_from_ref` to return the
project in the context if the project's `full_path` matches the ref
we're looking for, as it makes no sense to go to the database to find a
Project we already have loaded.
2018-10-04 10:12:18 -06:00
Bob Van Landuyt f1d3ea63cf Show the status of a user in interactions
The status is shown for
- The author of a commit when viewing a commit
- Notes on a commit (regular/diff)
- The user that triggered a pipeline when viewing a pipeline
- The author of a merge request when viewing a merge request
- The author of notes on a merge request (regular/diff)
- The author of an issue when viewing an issue
- The author of notes on an issue
- The author of a snippet when viewing a snippet
- The author of notes on a snippet
- A user's profile page
- The list of members of a group/user
2018-07-30 15:01:26 +02:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00
Rémy Coutable ab36cf05c8
Reduce CE/EE diff in spec/controllers/projects/issues_controller_spec.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-24 19:29:30 +02:00
Bob Van Landuyt eae2ed3366 Spec improvements for speed, reliability and readability 2018-04-12 18:05:50 +02:00
Bob Van Landuyt 71ccfde322 Correct permissions for creating merge requests from issues
This could only be possible for users that can create merge requests
within a project.

So they need to be a allowed to create a branch and create a merge request.
2018-04-11 10:51:17 +02:00
Jan Provaznik 65664c2eae Refactor discussions/notes code 2018-04-03 16:03:00 +00:00
Fatih Acet 059ab73b8e Render MR Notes with Vue with behind a cookie 2018-02-28 00:10:43 +00:00
Jan Provaznik b02a6bed85 Make pagination optional for issuables
On epics roadmap page we list all epics in the given time frame
without pagination (at least for the first iteration), in this
case it would be nice to use the existing issuables index logic
except pagination (see MR gitlab-ee!4281). For this reason this
patch allows to easily disable pagination.

Related gitlab-ee!4281
2018-01-30 15:43:44 +01:00
Jan Provaznik 4b6b8ecced Return last edited time instead of update time
For issuable models we keep two timestamps:
updated_at which is updated whenever any model attribute is changed,
last_edited_at which is changed when only title or description is
changed.

In UI bellow description we display who and when updated the item. But
last_edited_by (used for 'who') is mistakenly combined with updated_at
(when), last_edited_at should be used instead.

Closes #41247
2018-01-18 12:27:02 +01:00
blackst0ne 27c95364b5 Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
Douwe Maan c90415085d Merge branch '40871-todo-notification-count-shows-notification-without-having-a-todo' into 'master'
Resolve "Todo notification count shows notification without having a todo"

Closes #40871

See merge request gitlab-org/gitlab-ce!15807
2017-12-18 15:08:34 +00:00
Sean McGivern ef454f68e8 Reset todo counters when the target is deleted
When the target is deleted, todos are destroyed, but we did not reset the todo
cache for users with todos on the deleted target. This would only update after
the next time the todo cache was updated for that user.
2017-12-18 12:23:00 +00:00
Luke Bennett 1a3b292d35 Resolve "No feedback when checking on checklist if potential spam was detected" 2017-12-08 12:26:39 +00:00
Jarka Kadlecova 906d2f03d1 Refactor issuable destroy action 2017-11-06 13:02:50 +01:00
Jarka Kadlecova 064c8949bd CE port of code changed for epics 2017-11-02 07:14:35 +01:00
Sean McGivern 17b4367045 Revert "Merge branch '36670-remove-edit-form' into 'master'"
This reverts commit 915e35a299, reversing
changes made to 9533786f52.
2017-10-26 15:53:55 +01:00
Jacopo 2f40dac352 Refactor `have_http_status` into `have_gitlab_http_status` in the specs 2017-10-20 10:13:18 +02:00
Jen-Shin Lin bd46c8abfd Merge branch 'security-10-1' into '10-1-stable'
Security fixes for 10.1 RC

See merge request gitlab/gitlabhq!2209
2017-10-17 15:58:58 -07:00
Jarka Kadlecova 17709fa1b6 refactor issues_controller_spec `update` action 2017-10-03 11:28:42 +02:00
Jarka Kadlecova 7f69659a5d Remove edit action for issues 2017-10-03 11:26:12 +02:00
Stan Hu 8690ca5c28 Eliminate N+1 queries in loading discussions.json endpoint
In #37955,we see that the profile had a number of N+1 queries from repeated
access to `cross_reference_not_visible_for?`. This was optimized in previous
versions of GitLab by rendering all notes at once, counting the number of
visible references, and then using that number to check whether a system note
should be fully redacted.

There was also another N+1 query calling `ProjectTeam#member?`, which did not
take advantage of an optimization in prepare_notes_for_rendering that would
preload the maximum access level per project.

Closes #37955
2017-09-18 06:53:33 -07:00
Eric Eastwood 90c60138db Move "Move to different project" to sidebar
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34261
2017-09-03 22:03:17 -05:00
Douwe Maan b181d3124e Merge branch 'master' into issue-discussions-refactor
# Conflicts:
#	app/models/issue.rb
2017-08-30 10:14:56 +02:00
Maxim Rydkin fa030cbc85 replace `is_spam?` with `spam?` 2017-08-29 11:14:42 +03: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
Jarka Kadlecova b67e333ce8 fix static_analysis (rubocop) 2017-08-14 07:15:52 +02:00
Jarka Kadlecova d78037c246 Use UserNoteEntity instead of UserEntity for notes 2017-08-11 18:48:06 +02:00
Lin Jen-Shin 501be36c2e Just use the repo. Not sure why master could pass
It keeps giving me no repo error from setting up autocrlf,
which shouldn't have anything to do with this merge request.
2017-08-11 20:10:43 +08:00
Lin Jen-Shin e04c1ae7c7 Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-better
* upstream/master: (62 commits)
  Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.
  Docs: update user docs index
  Fix minor typos in views
  Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_spec
  Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'
  Merge branch 'import-symlinks-9-3' into 'security-9-3'
  Fix wrong method call on prometheus histogram
  Document new all-in-one Helm chart - docs
  Fix 404 on link path
  Fix line numbers not matching up to code in code viewer.
  Hide overflow-x on collapsed sidebar
  removed global use of breakpoint checker
  Increase performance of the breakpoint size checker
  Filter sensitive query string parameters from NGINX access logs
  Added a template for database changes
  Render new issue link in failed job as a regular link instead of a UJS one
  Include RE2 in the upgrade docs
  Remove affix plugin from issuable sidebar with new navigation
  Fix linter error
  alternative route for download archive
  ...
2017-08-11 19:15:35 +08:00
Lin Jen-Shin ae7c52a060 Fix more tests 2017-08-11 17:54:34 +08:00
Lin Jen-Shin 41a5adca75 Don't try to create diffs if one of the branch is missing
Also fix a few tests
2017-08-10 23:53:55 +08:00
Lin Jen-Shin 412db1874f Fix some tests and report the error message 2017-08-09 21:41:45 +08:00
Rémy Coutable c946ee1282
Enable the Layout/SpaceBeforeBlockBraces cop
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-09 11:52:22 +02:00
Robert Speicher 72a7b30c9f Change all `:empty_project` to `:project` 2017-08-02 17:47:31 -04:00
Rémy Coutable e43bda0ebb Merge branch 'dz-update-shoulda' into 'master'
Update shoulda-matchers gem to 3.1.2

See merge request !13040
2017-07-25 08:08:26 +00:00
Dmitriy Zaporozhets eafb03cfd5
Remove unnecessary set_flash.now from controller specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-07-24 15:21:16 +03:00
Jarka Kadlecova 2fa22a0729 Associate Issues tab only with internal issues tracker 2017-07-24 08:10:14 +02:00
Sean McGivern c6e979587a Merge branch '34930-fix-edited-by' into 'master'
Fix issue detail if user who last edited an issue was deleted

Closes #34930

See merge request !12933
2017-07-19 16:19:32 +00:00
Jarka Kadlecova a9d940bffc Use Ghost user when edited_by, merged_by deleted 2017-07-19 11:35:17 +02:00
Felipe Artur 3715c1cfb5 Fix external issue trackers redirect 2017-07-18 11:44:47 -03:00
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Grzegorz Bizon 0430b76441 Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00: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
Robert Speicher a6ec5121f0 Correct RSpec/SingleLineHook cop offenses 2017-06-14 13:18:56 -05:00
Stan Hu a7e82cbd61 Make sure reCAPTCHA configuration is loaded when spam checks are initiated
Previously it was possible when an issue was updated and Akismet flagged it as spam
that the reCAPTCHA configuration was not loaded.

Closes #33532
2017-06-10 03:43:02 -07:00
Phil Hughes 04178d72b5 fixed move issue specs
[ci skip]
2017-05-25 12:50:11 +01:00