Commit Graph
5184 Commits
Author SHA1 Message Date
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
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
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 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
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
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
Pablo Carranza b9306c2e82 Add cache count metrics to rails cache 2016-05-15 19:47:41 +01: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
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 715a8cfa2f Fix authentication service 2016-05-14 14:27:56 -05:00
Kamil Trzcinski 0a9979d9ef Rename specs 2016-05-14 11:16:11 -05:00
Kamil Trzcinski 63cdf1aeb0 Use Auth::ContainerRegistryAuthenticationService 2016-05-14 11:11:48 -05:00
Kamil Trzcinski 774a510782 Fix specs 2016-05-14 09:39:33 -05:00
Douglas Barbosa Alexandre ebaa19c162 Fix validation method for Gitlab::GithubImport::PullRequestFormatter 2016-05-13 17:55:43 -05:00
Douglas Barbosa Alexandre 795a7ca8f1 Extract GitHub branch formatter 2016-05-13 17:55:42 -05:00
Douglas Barbosa Alexandre e001bd5e3d Import PRs where branch names were reused across PRs 2016-05-13 17:55:42 -05:00
Douglas Barbosa Alexandre 7e1f14e215 Preserve commits/diff/comments for PRs that were merged on GitHub 2016-05-13 17:55:42 -05:00
Douwe Maan c452fa8124 Update specs 2016-05-13 17:31:58 -05:00
Douwe Maan 7848d54f5b Clean up LegacyDiffNote somewhat 2016-05-13 17:31:58 -05:00
Douwe Maan 99d3e21f19 Extract LegacyDiffNote out of Note 2016-05-13 17:31:43 -05:00
Kamil Trzcinski 0958f331d1 Merge remote-tracking branch 'origin/master' into docker-registry
# Conflicts:
#	config/initializers/1_settings.rb
2016-05-13 17:14:46 -05:00
Douglas Barbosa Alexandre 3b50867550 Fix spec for Gitlab::GithubImport::PullRequestFormatter 2016-05-13 16:49:27 -05:00
Artem Sidorenko e5c9710147 Use the relative url prefix for links in Wiki 2016-05-13 22:42:07 +02:00
Gabriel Mazetto f5a0ac0fc1 Codestyle: make sure we have space around operators 2016-05-13 04:46:56 -03:00
Douwe Maan 6aef256733 Merge branch 'fix_health_check_type' into 'master'
Fix minor typos in admin health check page

Fix minor typos from gitlab-org/gitlab-ce!3888

cc/ @DouweM @twk3 

See merge request !4134
2016-05-12 23:03:36 +00:00
Douwe Maan d2fb451c8f Merge branch 'rs-cleanup-events_helper_spec' into 'master'
Clean up EventsHelper spec

Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090

See merge request !4133
2016-05-12 22:41:19 +00:00
Robert Speicher 4735a75340 Merge branch 'deprecated-class-methods-cop' into 'master'
Enable the Rubocop DeprecatedClassMethods cop

This reports uses of `File.exists?` and `Dir.exists?`, which were both
deprecated in Ruby and will eventually be removed in favor of `.exist?`.
Also fixes all existing uses of the deprecated methods.

See merge request !4087
2016-05-12 22:41:01 +00:00
Drew Blessing 4fea5cda0b Fix minor typos in admin health check page 2016-05-12 17:11:37 -05:00
Robert Speicher 5186f6e3bd Merge branch 'default-scope-on-builds-page' into 'master'
Fix a description for default scope on builds

Should be "**All* builds (from this project)" for the {project,admin}
builds page without scope.

Fix a regression on !2243 (#4240).

See merge request !4118
2016-05-12 22:01:40 +00:00
Robert Speicher 05bbad5817 Clean up EventsHelper spec 2016-05-12 16:52:56 -05:00
Douwe Maan 850234ebd2 Merge branch 'feature/label-subscription-api' into 'master'
Add API endpoints for un/subscribing from/to a label



See merge request !4051
2016-05-12 21:51:21 +00:00
Douwe Maan 7fc51d1908 Merge branch 'health-check-route'
# Conflicts:
#	db/schema.rb
2016-05-12 16:39:03 -05:00
Ahmad Sherif 0c22698bd4 Add API endpoints for un/subscribing from/to a label
Closes #15638
2016-05-12 22:48:09 +02:00
Douwe Maan 74c69709dc Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources' 2016-05-12 15:11:37 -05:00
Kamil Trzcinski fc2d985bfa Fix CI tests 2016-05-12 12:47:55 -05:00
Jacob Schatz f2303f9df0 Merge branch 'send-incremental-build-log' into 'master'
Update build log incrementally

Proof of concept implementation of incremental sending of build log to browser.

cc @jschatz1 @vsizov @grzesiek @tmaczukin 


See merge request !3737
2016-05-12 16:48:42 +00:00
Takuya Noguchi 18fdbf0a03 Fix a description for default scope on builds 2016-05-13 01:28:55 +09:00
Yorick Peterse 945c5b3fe6 Removed tracking of total method execution times
Because method call timings are inclusive (that is, they include the
time of any sub method calls) this would lead to the total method
execution time often being far greater than the total transaction time.
Because this is incredibly confusing it's best to simply _not_ track the
total method execution time, after all it's not that useful to begin
with.

Fixes gitlab-org/gitlab-ce#17239
2016-05-12 15:15:45 +02:00