Commit Graph

45 Commits

Author SHA1 Message Date
GitLab Bot 9ccd95d7d7 Add latest changes from gitlab-org/gitlab@master 2024-12-04 21:34:59 +00:00
GitLab Bot b37966a868 Add latest changes from gitlab-org/gitlab@master 2024-04-17 15:10:00 +00:00
GitLab Bot 8da0fac362 Add latest changes from gitlab-org/gitlab@master 2024-04-12 18:16:02 +00:00
GitLab Bot f73fa6daff Add latest changes from gitlab-org/gitlab@master 2023-11-21 09:15:06 +00:00
GitLab Bot 9be457ffc1 Add latest changes from gitlab-org/gitlab@master 2023-08-03 18:10:18 +00:00
GitLab Bot cc9ff71e31 Add latest changes from gitlab-org/gitlab@master 2023-03-16 18:08:34 +00:00
GitLab Bot 948023c9c9 Add latest changes from gitlab-org/gitlab@master 2022-06-10 12:09:36 +00:00
GitLab Bot 678db4e394 Add latest changes from gitlab-org/gitlab@master 2021-11-05 03:12:26 +00:00
GitLab Bot 6463521e08 Add latest changes from gitlab-org/gitlab@master 2021-04-19 18:09:09 +00:00
GitLab Bot f1500a385a Add latest changes from gitlab-org/gitlab@master 2021-02-04 12:09:25 +00:00
GitLab Bot 2fe341d705 Add latest changes from gitlab-org/gitlab@master 2020-10-05 09:08:17 +00:00
GitLab Bot 8827c1d184 Add latest changes from gitlab-org/gitlab@master 2020-07-27 12:09:50 +00:00
GitLab Bot 14fb5a9222 Add latest changes from gitlab-org/gitlab@master 2020-07-23 15:09:28 +00:00
GitLab Bot d6348d22dd Add latest changes from gitlab-org/gitlab@master 2020-06-24 09:08:32 +00:00
GitLab Bot 1691cbe307 Add latest changes from gitlab-org/gitlab@master 2020-05-26 12:08:22 +00:00
GitLab Bot b375c6c05f Add latest changes from gitlab-org/gitlab@master 2020-03-02 15:08:01 +00:00
GitLab Bot eb1f5a3e08 Add latest changes from gitlab-org/gitlab@master 2020-02-17 18:09:00 +00:00
GitLab Bot dea6ebd31a Add latest changes from gitlab-org/gitlab@master 2019-09-30 12:06:01 +00:00
Constance Okoghenun c1c0c0c21b Display "commented" only for commit discussions on merge requests
Add commit prop to NoteableNote component and pass it from
NoteableDiscussion
2019-01-17 12:15:33 +01:00
Winnie Hellmann 0817c21067 Revert "Merge branch 'winh-discussion-header-commented' into 'master'"
This reverts merge request !23622
2018-12-21 17:00:26 +00:00
Douwe Maan 795b4a307f Link to specific commit note from MR commit discussion link 2018-12-19 23:54:54 +01:00
Mark Chao a63bce1a4b Resolve "Rename the `Master` role to `Maintainer`" Backend 2018-07-11 14:36:08 +00:00
blackst0ne 27c95364b5 Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
Micaël Bergeron c77083a493 fix the commit diff discussion sending the wrong url
it should now send you to the merge request diff path scoped to the commit.
2017-12-18 10:21:33 -05:00
micael.bergeron 966b1128d8 WIP: refactor the first-contributor to Issuable
this will remove the need make N queries (per-note) at the
cost of having to mark notes with an attribute

this opens up the possibility for other special roles for notes
2017-09-06 09:00:57 -04:00
micael.bergeron 5e600db21c fix #35161, add a first-time contributor badge
a new badge will be added when an user that doesn't yet
have any merged merge request is discussing on either issues or
merge requests that he created.

this is indented for people to use extra care when discussing with
a new contributor.
2017-09-06 09:00:57 -04:00
Sean McGivern e8f29569bc Resolve outdated diff discussions on push 2017-09-06 10:08:03 +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
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Luke "Jared" Bennett 32cac59727 Added more actions and report as abuse to all notes 2017-06-07 18:33:50 +00:00
Douwe Maan 6e698b254e Fix specs 2017-05-23 16:27:30 -05:00
Jarka Kadlecova e4f7b87ddb Support comments for personal snippets 2017-05-05 15:45:49 +02:00
Douwe Maan f8fabfcc6f Allow commenting on older versions of the diff and comparisons between diff versions 2017-05-03 14:47:21 -05:00
Douwe Maan afa53810de
Fix specs 2017-04-05 17:44:14 +01:00
Kamil Trzcinski 5b52da9c32 Revert unrelevant changes 2016-08-16 10:00:13 +02:00
Lin Jen-Shin 5f5503fb94 Make the comment more clear, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810778
2016-08-12 15:11:16 +08:00
Lin Jen-Shin 0b52517049 Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slack
* upstream/master: (233 commits)
  Fix awardable button mutuality loading spinners
  Update CHANGELOG for 8.10.5
  Clean up project destruction
  Small refactor of doc/development/README.md
  Avoid commit lookup on diff_helper
  Removed extra newline from redis_spec.rb
  Used cached value of project count to reduce DB load
  Remove duplicate link_to statements
  Mention add_column_with_default in downtime guide
  Add missing space to generic badge template
  Rename `run` task helper method to prevent conflict with StateMachine
  Add a method in Project to return a cached value of total count of projects
  spellcheck
  Add svg guidelines to ui guide
  Add Changelog entry for Grape upgrade [ci skip]
  Fix Grape tests.
  Retain old behavior
  Update Grape from 0.13.0 to 0.15.0.
  adds second batch of tests changed to active tense
  fixes part1 of files to start using active tense
  ...
2016-08-11 13:35:35 +08:00
tiagonbotelho 519275c110 fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
Lin Jen-Shin 5607fdf9fe Let's make sure cache were cleared:
I can't reproduce this failure locally.
Here's the failure:
https://gitlab.com/gitlab-org/gitlab-ce/builds/2864250
2016-08-05 14:37:45 +08:00
Stan Hu d1ea2bca61 Optimize maximum user access level lookup in loading of notes
NotesHelper#note_editable? and ProjectTeam#human_max_access currently
take about 16% of the load time of an issue page. This MR preloads
the maximum access level of users for all notes in issues and merge
requests with several queries instead of one per user and caches
the result in RequestStore.
2016-07-26 15:33:05 -07:00
Stan Hu 20688cdf07 Be explicit which project and user ID are memoized 2016-06-29 13:42:15 -07:00
Stan Hu 8c29b0b065 Memoize the maximum access level for the author of notes
In #19273, we saw that retrieving ProjectTeam#human_max_access for each
note takes the bulk of the time when rendering certain issues or merge requests.
We observe that most of the comments in an issue are typically done by the
same users. This MR memoizes the max access level by user ID.
2016-06-29 06:26:00 -07:00
Riyad Preukschas eb92813757 Move emoji auto-complete helper to ApplicationHelper 2012-10-10 00:53:42 +02:00
Riyad Preukschas bbd92e57cb Add emoji_for_completion helper 2012-10-09 14:47:42 +02:00