Tim Zallmann
2bfee0706a
Resolve "User profile activity feed contains broken image links"
2017-08-21 09:45:46 +00:00
Douwe Maan
cc543b6c85
Merge branch '36041-notification-title' into 'master'
...
Don't escape html entities in InlineDiffMarkdownMarker
Closes #36041
See merge request !13553
2017-08-18 08:50:59 +00:00
Jarka Kadlecova
c271fdc80f
Don't escape html entities when rich == raw line
2017-08-17 19:55:07 +02:00
Tim Zallmann
ee4528526e
Merge branch 'dispatcher-race-condition-fix' into 'master'
...
Fix race condition with dispatcher.js
See merge request !13377
2017-08-16 12:31:47 +00:00
Phil Hughes
554afea059
Fix race condition with dispatcher.js
...
The dispatcher was trying to create a new instance of a class that is loaded in a file after main.js which would cause the filtered search to not work on issues. This would only happen on the first load when the JS is not cached. If the JS is cached, then everything will be fine.
2017-08-15 16:09:36 +01:00
Yorick Peterse
b401b3025b
Allow usage of any_projects? with an Array
...
In some cases we pass an Array to this method which would previously
fail since Array does not respond to "limit_value".
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3646
2017-08-15 12:33:37 +02:00
Yorick Peterse
c1f9403e45
Use Prev/Next pagination for exploring projects
...
This changes the pagination of the "Explore" pages so they use a simpler
pagination system that only shows "Prev" and "Next" buttons. This
removes the need for getting the total number of rows to display, a
process that can easily take up to 2 seconds when browsing through a
large list of projects.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27390
2017-08-14 13:53:42 +02:00
Robert Speicher
4e2b630df7
Merge branch 'group-milestone-references-system-notes' into 'master'
...
Support group milestone references
Closes #34778
See merge request !13289
2017-08-07 19:22:41 +00:00
Sean McGivern
8c4d590973
Merge branch 'dashboard-projects-controller-query-performance' into 'master'
...
Improve various parts of Dashboard::ProjectsController
See merge request !13319
2017-08-07 15:06:12 +00:00
Sean McGivern
149528f472
Support references to group milestones
...
Group milestones can only be referred to by name, not IID. They also do not
support cross-project references.
2017-08-07 11:55:00 +01:00
Yorick Peterse
f77fda6437
Improve checking if projects would be returned
...
In various places we check if the same relation would return projects.
This is done using "any?" which will run a COUNT query with any
LIMIT/OFFSET values still applied.
To work around all this we introduce 2 helper methods that take care of
doing the right thing. This leads to the produced queries being simpler
and fewer queries being executed.
2017-08-07 12:38:27 +02:00
Bob Van Landuyt
3598e60bf2
Add a Circuitbreaker for storage paths
2017-08-04 15:38:48 +02:00
Tim Zallmann
dab08be606
Resolve "Specific Async Script Loading by using a Page Variable"
2017-08-03 20:31:53 +00:00
Robert Speicher
72a7b30c9f
Change all `:empty_project` to `:project`
2017-08-02 17:47:31 -04:00
Rémy Coutable
0bc1dfb6d5
Merge branch 'rs-empty_project-cleanup' into 'master'
...
Ensure all project factories use `:repository` trait or `:empty_project`
See merge request !13238
2017-08-02 09:45:42 +00:00
Clement Ho
974a04026d
Add filtered search to group issue dashboard
2017-08-02 09:27:24 +00:00
Robert Speicher
9513bd18c4
Ensure all project factories use `:repository` trait or `:empty_project`
2017-08-01 14:51:52 -04:00
Gabriel Mazetto
abb878326c
Rename many path_with_namespace -> full_path
2017-08-01 07:26:58 +02:00
Sean McGivern
15911ef327
Fix group milestone path on issuable sidebar
2017-07-31 19:06:16 +01:00
Sean McGivern
fdfb4bbe5c
Fix diff commenting results just after changing view
...
When you change the diff view (inline / side-by-side), we set a cookie based on
that new view. When you add a comment, we choose the style to use in the
response based on that cookie.
However, when you have just changed diff style, the request cookie will contain
the old value, so we should use the view param instead.
2017-07-28 13:59:57 +01:00
Keifer Furzland
7e113b6824
Remove superfluous type defs in specs
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:31:52 +02:00
Tim Zallmann
52b8a0db68
Resolve "Lazy load images on the Frontend"
2017-07-24 17:36:52 +00:00
Jarka Kadlecova
7bee7b848a
Support both internal and external issue trackers
2017-07-24 08:13:43 +02:00
Alexander Randa
e0ab5618a0
Wrong data type when testing webhooks
2017-07-20 15:12:06 +00: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
Rémy Coutable
0579a89fb9
Merge branch 'authentiq-updates' into 'master'
...
Added authentiq provider to tests and updated documentation, gem and config file.
See merge request !12952
2017-07-19 12:16:58 +00:00
Jarka Kadlecova
a9d940bffc
Use Ghost user when edited_by, merged_by deleted
2017-07-19 11:35:17 +02:00
Bob Van Landuyt
458f3cf9b0
Update specs for new upload path
2017-07-18 15:38:54 +02:00
Alexandros Keramidas
6bd94f20e3
Added authentiq provider to tests and updated documentation, gem and config file.
2017-07-18 00:12:50 +03:00
Sean McGivern
1afdbe320e
Merge branch 'fixes-for-internal-auth-disabled' into 'master'
...
Fixes needed when GitLab sign-in is not enabled
See merge request !12491
2017-07-14 08:49:36 +00:00
Robin Bobbitt
672a68d372
Fixes needed when GitLab sign-in is not enabled
...
When sign-in is disabled:
- skip password expiration checks
- prevent password reset requests
- don’t show Password tab in User Settings
- don’t allow login with username/password for Git over HTTP requests
- render 404 on requests to Profiles::PasswordsController
2017-07-13 10:08:27 -04:00
Rémy Coutable
3c2fd9d54d
Merge branch 'sh-fix-award-emoji-spec' into 'master'
...
Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id`
Closes gitlab-ee#2890
See merge request !12770
2017-07-11 08:36:16 +00:00
Paul Charlton
cb3b4a15e6
Support multiple Redis instances based on queue type
2017-07-11 03:35:47 +00:00
Stan Hu
cd7f03ef83
Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id`
...
Closes gitlab-org/gitlab-ee#2890
2017-07-10 17:14:00 -07:00
Tim Zallmann
64e589c581
Resolve "Inconsistent location of members page between groups and projects"
2017-07-07 14:40:41 +00: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
Rémy Coutable
4818f904c2
Use stub_application_setting when testing ApplicationHelper#support_url
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-04 13:54:35 +02:00
Sean McGivern
063b035d93
Merge branch '34116-milestone-filtering-on-group-issues' into 'master'
...
Use correct milestones for filtering on Group Issues
Closes #34116
See merge request !12374
2017-07-03 11:17:55 +00:00
Phil Hughes
ec396fd93a
New navigation breadcrumbs
2017-06-30 16:52:11 +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
Douwe Maan
78379f66dd
Strip trailing whitespace in relative submodule URL
2017-06-28 14:01:49 -05:00
Rémy Coutable
6a2186c7e4
Merge branch 'pat-alert-when-signin-disabled' into 'master'
...
Provide hint to create a personal access token for Git over HTTP
See merge request !12105
2017-06-27 10:29:45 +00:00
Robin Bobbitt
7eb26c7ff7
Provide hint to create a personal access token for Git over HTTP
...
If internal auth is disabled and user is not an LDAP user, present
the user with an alert to create a personal access token if he does
not have one already.
2017-06-26 14:41:27 -04:00
Rémy Coutable
ce25b15c2d
Tag a spec as :nested_groups since it fails on MySQL
...
This was broken by
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12322 .
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-26 17:32:22 +02:00
Takuya Noguchi
175b7834c3
Add tests for MilestonesHelper#milestones_filter_dropdown_path
2017-06-26 23:54:07 +09:00
Michael Kozono
daef408712
Fix breadcrumb order
2017-06-22 13:38:29 -07:00
Grzegorz Bizon
0430b76441
Enable Style/DotPosition Rubocop 👮
2017-06-21 13:48:12 +00:00
Sean McGivern
1c4262156f
Fix avatar images in pipeline emails
2017-06-20 15:42:10 +01:00
Douwe Maan
5e8aca2152
Don't display comment on unchanged line on both sides in parallel diff
2017-06-19 11:50:46 -05:00