Commit Graph
28205 Commits
Author SHA1 Message Date
Phil Hughes d53bfcb0bb Updated snippets tests 2016-05-19 10:01:27 +01:00
Phil Hughes da5f0b9119 Updated snippets UI
Closes #14328
2016-05-18 14:11:06 +01:00
Rémy Coutable da8ac1635f Merge branch 'issue_17302' into 'master'
Fix api leaking notes when user is not authorized to read noteable

fixes #17302

See merge request !4102
2016-05-18 04:31:12 +00:00
Felipe Artur 5bf49bb63d Move note helper method to notes entity file 2016-05-17 21:41:53 -05:00
Robert Speicher 98d88e8188 Merge branch 'fix/gitlab-import-data' into 'master'
fix typo making gitlab.com importing to fail

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565

See merge request !4181
2016-05-17 19:49:12 +00:00
James Lopez ab2a1d2345 added CHANGELOG 2016-05-17 15:29:53 +02:00
James Lopez 4e9ce5abe2 fix typo from bad refactoring 2016-05-17 15:19:59 +02:00
Rémy Coutable 28eea9bdfd Merge branch 'instrument-api-helpers' into 'master'
Instrument all Grape API helpers

This has been added to help us figure out what's making certain Grape API calls slow (e.g. the one used for authorized keys as described in gitlab-com/operations#99).

See merge request !4169
2016-05-16 23:12:55 +00:00
Yorick Peterse b933367ab3 Instrument all Grape API helpers 2016-05-17 00:16:49 +02:00
Dmitriy Zaporozhets 4ade5ff425 Merge branch 'dz-fix-sidebar-overlap' into 'master'
Fix left sidebar overlap when scroll on long menu

Fixes #17566. Caused by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4139. Smaller fix compared to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4164

cc @iamphill @jschatz1 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !4165
2016-05-16 21:47:21 +00:00
Douwe Maan 8b15628dd0 Merge branch 'issue_14684' into 'master'
Toggle email signup confirmation in admin settings

Implements toggling verification email #14684

See merge request !3862
2016-05-16 21:05:05 +00:00
Douwe Maan c9649198a1 Merge branch 'rs-event-titles' into 'master'
Add an Event's target's title to its reference link

Given an activity feed entry like:

> Douwe Maan commented on [issue #123] at [gitlab-org/gitlab-ce]

...the `issue #123` link will now have a `title` attribute.

Plus some minor refactorings, see individual commits for details.

See merge request !4090
2016-05-16 20:58:52 +00:00
Douwe Maan 7ef4466512 Merge branch 'disallow-uploads' into 'master'
Disallow search engines from indexing uploads from a GitLab project.

This can sometimes include sensitive information from private projects and confidential issues. It shouldn't be indexed. Resolves #15551.

cc: @DouweM 

See merge request !4167
2016-05-16 20:53:45 +00:00
Rémy Coutable 4f66799738 Merge branch 'wiki-fix-reloaded' into 'master'
Use the relative url prefix for links in Wiki

Retry of gitlab-org/gitlab-ce!4026

@rymai !4050 solved all other problems how it looks like. I [tested](https://gitlab.com/artem-forks/gitlab-ce/commit/ff01eca7b559efa7cacf3412aa01cd8ae8a6db7e/builds) this with ruby22

Fixes #17071 



See merge request !4131
2016-05-16 20:30:42 +00:00
Rémy Coutable 1c86e804ed Merge branch 'unexpected-filtering-on-merge-requests' into 'master'
Add tests for unintentional filtering bug in MR

!3872 has a lack of tests for Merge Requests while !3872 has only ones for Issues.

This MR has complementary tests for MR list.

See merge request !4154
2016-05-16 20:23:38 +00:00
Connor Shea d71edf0ded Disallow search engines from indexing uploads from a GitLab project.
This can sometimes include sensitive information from private projects and confidential issues. It shouldn't be indexed. Resolves #15551.
2016-05-16 15:04:14 -05:00
Felipe Artur ecce94d3aa fix default send confirmation value 2016-05-16 16:53:11 -03:00
Robert Speicher 020e616822 Reduce duplication and branching logic in EventsHelper
Remove unused methods from Event model
2016-05-16 14:52:04 -05:00
Robert Speicher 0ec2ee71b3 Rename Event#note_project_snippet? to project_snippet_note? 2016-05-16 14:52:04 -05:00
Robert Speicher b2fc0a51a6 Rename Event#note_commit? to commit_note? 2016-05-16 14:52:03 -05:00
Robert Speicher 8a7b5b17d3 Remove redundant html_escape calls from title attributes
These get escaped automatically.
2016-05-16 14:52:03 -05:00
Robert Speicher 3950f8074c Fix titles for commit references in Event feed
Prior, the `title` attribute was being included as an argument to the
route helper rather than as an argument to `link_to`.
2016-05-16 14:52:03 -05:00
Robert Speicher c05ed99bff Simplify Event's target type-checking 2016-05-16 14:52:03 -05:00
Robert Speicher 6286b28bbc Add an Event's target's title to its reference link
Given an activity feed entry like:

> Douwe Maan commented on [issue #123] at [gitlab-org/gitlab-ce]

...the `issue #123` link will now have a `title` attribute.
2016-05-16 14:52:02 -05:00
Felipe Artur c9be74e247 Fix single note api request 2016-05-16 16:43:19 -03:00
Douwe Maan a511a12265 Merge branch '17227-upcoming-milestone-is-confusing-when-projects-have-different-milestones' into 'master'
Make upcoming milestone work across projects

Before: we took the next milestone due across all projects in the
search and found issues whose milestone title matched that
one. Problems:

1. The milestone could be closed.
2. Different projects have milestones with different schedules.
3. Different projects have milestones with different titles.
4. Different projects can have milestones with different schedules, but
   the _same_ title. That means we could show issues from a past
   milestone, or one that's far in the future.

After: gather the ID of the next milestone on each project we're looking
at, and find issues with those milestone IDs. Problems:

1. For a lot of projects, this can return a lot of IDs.
2. The SQL query has to be different between Postgres and MySQL, because
   MySQL is much more lenient with HAVING: as well as the columns
   appearing in GROUP BY or in aggregate clauses, MySQL allows them to
   appear in the SELECT list (un-aggregated).

Closes #17227.

See merge request !4125
2016-05-16 19:28:17 +00:00
Robert Speicher f234388992 Merge branch '13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-login' into 'master'
Force password change after admin reset

Closes #13691.

See merge request !4016
2016-05-16 18:04:23 +00:00
Felipe Artur 7bb84e6497 Change landing page when skipping confirmation email and add documentation 2016-05-16 14:56:32 -03:00
Felipe Artur 0baadd6cff Fix changelog file 2016-05-16 14:56:32 -03:00
Felipe Artur c5526a2d9a Change skip_user_confirmation_email to send_user_confirmation_email 2016-05-16 14:56:32 -03:00
Felipe Artur 71ca2de7aa Toggle email signup confirmation in admin settings 2016-05-16 14:56:32 -03:00
Dmitriy Zaporozhets e9fdfb9a71 Fix left sidebar overlap when scroll on long menu
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-16 12:44:07 -05:00
Douwe Maan 59e62fc486 Merge branch 'docker-registry' into 'master'
Added authentication service for docker registry

This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes.

I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry?

What do you think @jacobvosmaer @sytses @marin?

cc @marin 

See merge request !3787
2016-05-16 17:20:31 +00:00
Douwe Maan 5dd013f145 Merge branch 'gh-pull-requests' 2016-05-16 12:12:20 -05:00
Kamil Trzcinski 7257703388 Bring back port to registry configuration 2016-05-16 09:45:18 -05:00
Sean McGivern e8058bd231 Return a relation with Postgres
Postgres only needs to select a single column, so that can used as a
sub-query where `Milestone.upcoming_ids_by_projects` is actually used in
`IssuableFinder`.

MySQL needs to select the `due_date` column because it's used in the
`HAVING` clause, so it has to return an array of IDs.
2016-05-16 10:25:24 +01:00
Sean McGivern 750b2ff0ee Make upcoming milestone work across projects
Before: we took the next milestone due across all projects in the
search and found issues whose milestone title matched that
one. Problems:

1. The milestone could be closed.
2. Different projects have milestones with different schedules.
3. Different projects have milestones with different titles.
4. Different projects can have milestones with different schedules, but
   the _same_ title. That means we could show issues from a past
   milestone, or one that's far in the future.

After: gather the ID of the next milestone on each project we're looking
at, and find issues with those milestone IDs. Problems:

1. For a lot of projects, this can return a lot of IDs.
2. The SQL query has to be different between Postgres and MySQL, because
   MySQL is much more lenient with HAVING: as well as the columns
   appearing in GROUP BY or in aggregate clauses, MySQL allows them to
   appear in the SELECT list (un-aggregated).
2016-05-16 10:25:24 +01:00
Sean McGivern 91480e5e7f Tidy up IssuesFinder specs
- Don't do setup in spec bodies.
- Don't `describe` a symbol.
- Don't use 'should'.
2016-05-16 10:25:24 +01:00
Sean McGivern bec350528c Force password change after admin reset
When an admin changes a user's password for them, force the user to
reset the password after logging in by expiring the new password
immediately.
2016-05-16 09:21:24 +01:00
Yorick Peterse 78a67fc48d Merge branch 'add-cache-count-metrics' into 'master'
Add cache count metrics to rails cache

See merge request !4157
2016-05-16 03:34:07 +00:00
Pablo Carranza b9306c2e82 Add cache count metrics to rails cache 2016-05-15 19:47:41 +01:00
Kamil Trzcinski bc32a3ecc7 Fix offline_token http_status code 2016-05-15 10:47:38 -05:00
Kamil Trzcinski 28ed990704 Fix http status codes for container registry authentication service 2016-05-15 10:47:04 -05:00
Kamil Trzcinski dfd0e2450a Improve authentication service specs 2016-05-15 08:52:26 -05:00
Kamil Trzcinski 7b88dca77e Update JwtController specs 2016-05-15 00:33:06 -05:00
Kamil Trzcinski e8f7e5516b Added specs for JwtController 2016-05-14 19:45:48 -05:00
Kamil Trzcinski 8d445fe665 Improve JwtController 2016-05-14 19:45:33 -05:00
Takuya Noguchi 0d93e93e79 Add tests for unintentional filtering bug in MR (cf. !3872) 2016-05-15 09:18:23 +09:00
Kamil Trzcinski f4f9184a01 Rename JWT to JSONWebToken 2016-05-14 18:23:31 -05:00
Kamil Trzcinski df973df8c5 Simplify JWT::RSAToken::kid 2016-05-14 16:04:26 -05:00