root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
101,747 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

75 Commits

Author SHA1 Message Date
Mike Greiling 3399335602 Revert "Merge branch 'remove-vue-resource-from-sidebar-service' into 'master'" 
This reverts merge request !32400
 2019-09-03 22:44:56 +00:00
Lee Tickett 19371b9062 Revert "DB change, migratoin and changelog" 
This reverts commit af5242ecb682189c5d8276e1ab1ffe5ce844f2e5.
 2019-09-03 19:10:08 +00:00
Donald Cook 293ef17e73 Backport: Issue sidebar tracking 
Added snowplow event tracking to Edit buttons
 2019-08-21 19:12:11 +00:00
Samantha Ming 1c7cbc25b9
Apply patch and update spec per MR comments 
- Use wrapper instead of global Vue object
- Use vue utils helper method
- Remove redundant spec tests
 2019-08-20 15:15:19 -05:00
Samantha Ming f1f34baf6f
Improve UX multi assigness in MR 
Add merge warning on avatar in:
- open view assigness
- collapsed view assigness
- dropdown (search) view assigness

Add can_merge option to MR sidebar entity
 2019-08-20 15:15:18 -05:00
Christie Lenneville c433082f89 Change 'Todo' to 'To Do' 
Currently, we label items to be done as "Todo." This is grammatically
incorrect and (therefore) confusing—especially to our Spanish-speaking
users for whom "todo" has a specific and unrelated meaning.

We should use "To Do" and always use it as singular (not "To Dos").

Updates to wording in a few places per MR (ee) discussion

Updating locale/gitlab.pot

Updates to wording in a few places per MR (ee) discussion

Updating locale/gitlab.pot
 2019-07-04 15:45:54 +00:00
Heinrich Lee Yu 275a17589c Rename to time_tracking_limit_to_hours 
Changes migration and all other places the attribute is used
 2019-06-25 09:31:23 +08:00
Victor Wu 79086edeef `None` for assignees 
Update assignees_spec.js

Update sidebar_spec.rb

Update issues_spec.rb
 2019-04-16 20:21:56 +00:00
Oswaldo Ferreira ca884980ee [CE] Support multiple assignees for merge requests 
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
 2019-04-08 18:40:00 -03:00
Winnie Hellmann 52515dda0b Copy sidebar todo component from EE 2019-04-04 08:21:27 +00:00
Winnie Hellmann 4cdef3da6c Copy missing test in assignees_spec.js from EE 2019-03-26 20:23:19 +01:00
Winnie Hellmann ad985a7a28 Merge branch 'winh-remove-sushi' into 'master' 
Remove .raw from JavaScript fixture file names

Closes #59201

See merge request gitlab-org/gitlab-ce!26430

(cherry picked from commit 79a45f7f02)
 2019-03-26 16:03:28 +00:00
Winnie Hellmann 514ee63826 Move some tests from Karma to Jest 2019-03-23 17:53:46 +01:00
Filipa Lacerda 022968764c Revert "Merge branch 'winh-remove-sushi' into 'master'" 
This reverts merge request !26430
 2019-03-22 11:03:15 +00:00
Winnie Hellmann 3e9bb4ad31 Remove .raw from JavaScript fixture file names 
There is nothing more to say but

"Commits that change 30 or more lines across at least three files
must describe these changes in the commit body"
 2019-03-21 17:16:53 +01:00
Heinrich Lee Yu 6c79e9307e Refactor issuable sidebar to have extras option 2018-12-19 17:58:53 +08:00
Mike Greiling 3d13d369f9
Fix eslint violations 2018-10-31 14:33:12 -05:00
Mike Greiling 160157a92b
Prettify remaining files with differences in CE and EE 2018-10-31 14:33:12 -05:00
Mike Greiling f666026d71
Prettify all spec files 2018-10-17 11:18:17 -05:00
Johann Hubert Sonntagbauer 6f5723a169 enable jasmine/new-line-before-expect 2018-10-17 06:57:29 +02:00
Johann Hubert Sonntagbauer 65d7bf20e3 Fix props name casing in time time tracker vue component 2018-10-03 08:34:13 +00:00
Marcel Amirault 6876c7afa8 Fix grammar (setup to set-up) in code comments, spec, views, etc. 2018-09-17 09:17:33 +00:00
Jarka Kadlecová 15179878d5 Revert "Revert "Merge branch 'ee-5481-epic-todos' into 'master'"" 
This reverts commit 8717c7dad9.
 2018-08-02 10:42:45 +02:00
Clement Ho 6709cfc61b Replace issues time tracking progress bar with gitlab-ui's progress bar 2018-07-25 21:06:03 +00:00
George Tsiolis f1c7ab5165 Replace author_link snake case in specs 2018-07-24 10:53:59 +03:00
Winnie Hellmann 9a05495503 Remove timeouts from TimeTracker tests 2018-07-12 07:41:49 +00:00
Jarka Kadlecová 8717c7dad9 Revert "Merge branch 'ee-5481-epic-todos' into 'master'" 
This reverts commit 4d9a3f42f1, reversing
changes made to ecf9c145f6.
 2018-07-11 18:33:24 +02:00
Kushal Pandya 18c9cad0ea Sidebar Todo Component 2018-07-04 13:07:43 +05:30
Lukas Eipert 6e1a7902f4
fix last lints 2018-05-29 18:42:51 +02:00
Clement Ho 5955caed32 Merge branch 'master' into bootstrap4 2018-05-08 10:49:30 -05:00
Kushal Pandya e164447bf1 Emit `toggleSidebar` event on component when icon is clicked 2018-05-03 16:34:03 +05:30
Kushal Pandya 342fbbdaa2 Consume `toggleSubscription` event directly from Subscriptions component 2018-05-03 16:34:03 +05:30
Kushal Pandya d2665707c0 Emit `toggleSubscription`, `toggleSidebar` events on component 2018-05-03 16:34:01 +05:30
Rémy Coutable 1f08fab43f Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'" 
This reverts merge request !18682
 2018-05-02 15:32:03 +00:00
Kushal Pandya aa0a35a867 Consume `toggleSubscription` event directly from Subscriptions component 2018-05-02 15:24:02 +05:30
Kushal Pandya de3194bf89 Emit `toggleSubscription` event on component instead of eventHub 2018-05-02 15:23:30 +05:30
Clement Ho f9e2b4730f Merge branch 'master' into 'bootstrap4' 
# Conflicts:
#   app/views/projects/branches/_branch.html.haml
 2018-05-01 16:21:47 +00:00
Phil Hughes 2f7b71df76 Merge branch '10-7-security_issue_42029' into 'security-10-7' 
Sanitize user name to avoid XSS attacks

See merge request gitlab/gitlabhq!2373
 2018-04-30 15:01:01 -05:00
Clement Ho ef7f002e31 Merge branch 'bootstrap4' of gitlab.com:gitlab-org/gitlab-ce into bootstrap4 2018-04-25 10:53:15 -05:00
Simon Knox dc69ae177b fix dropdown fixture, BS4 wants dropdown-menu 2018-04-25 12:56:27 +10:00
Mike Greiling 8fa0aeb880
fix illegal references to "this" in module context 2018-04-23 00:54:20 -05:00
Mike Greiling 704e866134
fix more instances of "import *" with spyOnDependency 2018-04-23 00:54:20 -05:00
Dennis Tang 91a4eb1cb1 Resolve "Clicking confidential and lock icons on sidebar should also activate dropdown" 2018-04-02 18:46:50 +00:00
Filipa Lacerda 3e6e2ef60d
Removes eslint disabled comments 2018-03-29 18:56:19 +01:00
Phil Hughes bd26e012fc Merge branch 'remove-jquery-globals' into 'master' 
Require jQuery to be explicitly imported

See merge request gitlab-org/gitlab-ce!17674
 2018-03-12 10:55:46 +00:00
Mike Greiling f248be7257
require jQuery to be explicitly imported 2018-03-09 15:18:09 -06:00
George Tsiolis b3152bf245 Move AssigneeTitle vue component 2018-03-09 20:04:57 +02:00
George Tsiolis 7ea10d4d4c Move SidebarAssignees vue component 2018-03-07 20:33:27 +02:00
Filipa Lacerda 56af0631c6 Merge branch 'refactor/move-assignees-vue-component' into 'master' 
Move (Multiple) Assignees vue component

See merge request gitlab-org/gitlab-ce!16952
 2018-02-28 11:17:36 +00:00
George Tsiolis 514f22c475 Move Assignees vue component 2018-02-27 19:54:56 +02:00