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
92,237 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

67 Commits

Author SHA1 Message Date
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
Rémy Coutable d434c62a83 Move EE-specific JavaScript files to ee/app/assets/javascripts 2018-02-26 19:43:34 +00:00
Jacob Schatz 35c8fd5586 Update to jQuery 3. 2018-02-20 22:20:48 +00:00
Achilleas Pipinellis 85940d766a
Default to HTTPS for all Gravatar URLs 
If using gravatar.com, both plain_url and ssl_url in settings are now
served via HTTPS. Make this the default.
 2018-01-25 10:00:46 +01:00
Mike Greiling d77d174918
update karma tests 2018-01-12 01:10:55 -06:00
Filipa Lacerda 1245d35f14 Merge branch 'main-js-tidy-up' into 'master' 
Tidy up main JS file

See merge request gitlab-org/gitlab-ce!16007
 2018-01-11 18:40:22 +00:00
Phil Hughes ff0f74ac6e
Tidy up main JS file 2018-01-10 11:07:42 +00:00
Yorick Peterse d0b8f536a1
Remove soft removals related code 
This removes all usage of soft removals except for the "pending delete"
system implemented for projects. This in turn simplifies all the query
plans of the models that used soft removals. Since we don't really use
soft removals for anything useful there's no point in keeping it around.

This _does_ mean that hard removals of issues (which only admins can do
if I'm not mistaken) can influence the "iid" values, but that code is
broken to begin with. More on this (and how to fix it) can be found in
https://gitlab.com/gitlab-org/gitlab-ce/issues/31114.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
 2018-01-08 17:04:45 +01:00
Jacob Schatz 9c6ce2e8c9 Merge branch 'backport-epic-in-issue' into 'master' 
Backport epic in issue

See merge request gitlab-org/gitlab-ce!15799
 2017-12-11 20:48:52 +00:00