Commit Graph

27 Commits

Author SHA1 Message Date
Jan Provaznik 22addf2673 Don't convert issuable_initial_data into JSON
Instead of converting hash into JSON inside
issuable_initial_data method, return hash and convert
to JSON later. This allows us to easily extend basic
issuable data with resource specific values. For example
for Epic these data should include also labels, so we can then
do something like:
issuable_initial_data(@epic).merge(labels: @epic.labels).to_json
2018-02-26 10:10:21 +01:00
Robert Speicher def2f12995 Merge branch '41247-timestamp' into 'master'
Use last_edited_at instead of updated_at for displaying issuable last change

Closes #41247

See merge request gitlab-org/gitlab-ce!16406
2018-01-18 23:05:28 +00:00
Felipe Artur a956fac221 Remove unnecessary query from labels filter 2018-01-18 13:51:46 -02: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
Clement Ho 52eac5bb0e Backport epic tasklist 2017-11-29 09:29:06 +00:00
Jarka Kadlecova 064c8949bd CE port of code changed for epics 2017-11-02 07:14:35 +01:00
Sean McGivern e7817fc1e0 Remove issuable finder count caching
We're going to cache the total open count separately, and then just perform
these counts on the list. We already do that to get the pagination information,
through Kaminari, and a future change will make Kaminari reuse the query results
from earlier in the request.
2017-08-31 12:21:39 +01: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
Jarka Kadlecova a9d940bffc Use Ghost user when edited_by, merged_by deleted 2017-07-19 11:35:17 +02:00
Paul Charlton cb3b4a15e6 Support multiple Redis instances based on queue type 2017-07-11 03:35:47 +00:00
Sean McGivern 0c6cdd0782 Make finders responsible for counter cache keys 2017-06-30 10:33:46 +01:00
Sean McGivern 20bb678d91 Cache total issue / MR counts for project by user type
This runs a slightly slower query to get the issue and MR counts in the
navigation, but caches by user type (can see all / none confidential issues) for
two minutes.
2017-06-30 10:33:44 +01:00
Grzegorz Bizon 0430b76441 Enable Style/DotPosition Rubocop 👮 2017-06-21 13:48:12 +00:00
Luke "Jared" Bennett 5a4a082490
Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-for-issues-9-3 2017-06-02 17:17:54 +01:00
Luke "Jared" Bennett e591401b0b
Removed unneeded newline in issuables_helper_spec and removed unneeded updated_at_by variable in issuable_app_data 2017-06-02 10:27:53 +01:00
Luke "Jared" Bennett b888ed59ab
Fixed issuables_helper_spec and added a test for issuable_app_data 2017-05-31 14:03:32 +01:00
Luke "Jared" Bennett 632d0c0a4c
Remove EditableHelper and move method to IssuablesHelper 2017-05-31 11:35:05 +01:00
Valery Sizov 387c4b2c21 Backport of multiple_assignees_feature [ci skip] 2017-05-04 17:11:53 +03:00
Douwe Maan 1fe7501b49 Revert "Prefer leading style for Style/DotPosition"
This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
2017-02-23 09:33:05 -06:00
Douwe Maan 7d4b52b27d Enable Style/WordArray 2017-02-23 09:32:41 -06:00
Douwe Maan 206953a430 Prefer leading style for Style/DotPosition 2017-02-23 09:32:22 -06:00
Oswaldo Ferreira 78b0106878 Move issuable reference display to a helper method 2017-01-27 20:20:19 -02:00
Semyon Pupkov a4e4110700 Refactor issuable_filters_present to reduce duplications
https://gitlab.com/gitlab-org/gitlab-ce/issues/23546
2016-11-28 14:48:03 +05:00
Rémy Coutable 56259155d5 Small improvements thanks to Robert's feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-30 12:02:54 +02:00
Rémy Coutable 383dafdf31 Cache the issuable counters for 2 minutes
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-30 12:02:54 +02:00
Phil Hughes d1b987fd05 Changed file name
Updated spec HAML
2016-08-19 15:36:49 +01:00