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

2595 Commits

Author SHA1 Message Date
Mayra Cabrera d6450717ab Modifies index on DeployTokens to use id 2018-04-06 21:20:17 -05:00
Mayra Cabrera 18a1569319 Handles default expires_at date directly into DeployToken model 2018-04-06 21:20:17 -05:00
Mayra Cabrera 2991381630 Addresses database comments 
- Adds a default on expires_at datetime
- Modifies deploy tokens views to handle default expires at value
- Use datetime_with_timezone where possible
- Remove unused scopes
 2018-04-06 21:20:17 -05:00
Mayra Cabrera a475411f43 Fixes broken schema and minor changes 2018-04-06 21:20:16 -05:00
Kamil Trzciński 2c6c61815e Get rid of Redis when dealing with deploy tokens 
We use controller actions to pass a newly created token and errors
 2018-04-06 21:20:16 -05:00
Kamil Trzciński 6b2954ec8a Fix and optimise DB schema 2018-04-06 21:20:16 -05:00
Mayra Cabrera 8315861c9a Include ProjectDeployTokens 
Also:
- Changes scopes from serializer to use boolean columns
- Fixes broken specs
 2018-04-06 21:20:16 -05:00
Mayra Cabrera db18993f65 Create barebones for Deploytoken 
Includes:
- Model, factories, create service and controller actions
- As usual, includes specs for everything
- Builds UI (copy from PAT)
- Add revoke action

Closes #31591
 2018-04-06 21:20:16 -05:00
Kamil Trzciński 57ec7c618e Merge branch 'fix/gb/reschedule-pipeline-stages-migration' into 'master' 
Reschedule pipeline stages migration to run it again

See merge request gitlab-org/gitlab-ce!18191
 2018-04-05 12:09:04 +00:00
Grzegorz Bizon dbee81480b Reschedule pipeline stages migration to run it again 2018-04-05 10:54:33 +02:00
Douwe Maan 52967b107b
Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'security-10-6' 
[10.6] Prevent notes on confidential issues from being sent to chat

See merge request gitlab/gitlabhq!2366
# Conflicts:
#	app/helpers/services_helper.rb
 2018-04-05 08:41:56 +02:00
Sean McGivern 7c36e8561c Merge branch '41967_issue_api_closed_by_info' into 'master' 
Add closed by information to issue API

See merge request gitlab-org/gitlab-ce!17042
 2018-03-30 15:43:45 +00:00
Kamil Trzciński 8b37ce6f7f Merge branch 'add-per-runner-job-timeout' into 'master' 
Add per runner job timeout

Closes #43426

See merge request gitlab-org/gitlab-ce!17221
 2018-03-29 10:54:06 +00:00
Bob Van Landuyt db75057c72 Add the RedirectRoute#path index setup_postgresql 2018-03-28 14:12:08 +02:00
Bob Van Landuyt dbb1b5dbf4 Add index on lower path to redirect routes 
This will speed up the LIKE query in
RedirectRoute.matching_path_and_descendants
 2018-03-28 14:12:08 +02:00
Bob Van Landuyt 7ea08566f3 Remove `permanent` from `redirect_routes` 
This removes the column that was added in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15670 since we
will no longer be allowing _permanent_ redirects
 2018-03-28 14:12:07 +02:00
Tomasz Maczukin 403decbbad
Add explicit primary key for ci_builds_metadata table 2018-03-28 14:00:04 +02:00
Tomasz Maczukin a1cd3390e5
Add project_id column to Ci::BuildMetadata 2018-03-28 13:58:34 +02:00
Tomasz Maczukin d58d3098f1
Rename used_timeout to timeout 2018-03-28 13:58:16 +02:00
Tomasz Maczukin f5e602ee0f
Rename maximum_job_timeout to maximum_timeout 2018-03-28 13:58:15 +02:00
Tomasz Maczukin bb64b20a1f
Refactorize Ci::Build and Ci::BuildMetadata models 2018-03-28 13:57:41 +02:00
Tomasz Maczukin 1dde609ca6
Move job timeout information to new ci_builds_metadata table 2018-03-28 13:57:40 +02:00
Tomasz Maczukin 1b0b8b9c02
Change timeout_source to enum 2018-03-28 13:57:18 +02:00
Tomasz Maczukin 40f57b9b62
Use change instead of up/down in simple migrations 2018-03-28 13:56:56 +02:00
Tomasz Maczukin 78a4189ece
Show timeout information on job's page 2018-03-28 13:56:55 +02:00
Tomasz Maczukin d633bc8134
Rename job_upper_timeout to maximum_job_timeout 2018-03-28 13:55:46 +02:00
Tomasz Maczukin fb0dec4e00
Add new column to ci_runners table 2018-03-28 13:55:45 +02:00
Andreas Brandl f208411bff Remove unused index from events table. 
Closes #44467.
 2018-03-27 12:17:56 +02:00
Sean McGivern 835fe4d324 Merge branch '40781-os-to-ce' into 'master' 
Bring Object Storage to CE

Closes #4171, #4163, #3370, #2841, and #29203

See merge request gitlab-org/gitlab-ce!17358
 2018-03-27 08:20:03 +00:00
Grzegorz Bizon 6c8d4b80da Merge branch 'YarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-request' into 'master' 
Send notification emails when push to a merge request

Closes #23460

See merge request gitlab-org/gitlab-ce!17865
 2018-03-26 16:02:37 +00:00
YarNayar 99b01e2359 Send notification emails when push to a merge request 
Closes #23460
 2018-03-26 13:24:52 +01:00
Nick Thomas 457a99c612 Merge branch 'pages_force_https' into 'master' 
HTTPS only Pages

Closes #28857

See merge request gitlab-org/gitlab-ce!16273
 2018-03-23 15:48:28 +00:00
Sean McGivern bb9d360c0a Merge branch 'mark-legacy-git-access' into 'master' 
Route path lookups through legacy_disk_path

See merge request gitlab-org/gitlab-ce!17743
 2018-03-23 10:20:45 +00:00
Rob Watson 9d45951fca Add HTTPS-only pages 
Closes #28857
 2018-03-22 19:58:36 +01:00
Micaël Bergeron 9c6663ea07 Merge remote-tracking branch 'origin/master' into 40781-os-to-ce 2018-03-22 09:06:10 -04:00
Micaël Bergeron 44f37504fb Backport ee-40781-os-to-ce 2018-03-22 08:49:04 -04:00
James Lopez 2eab1fd2c9 Merge branch 'master' into 'latest-security-to-master-21-03-18' 
# Conflicts:
#   Gemfile
#   Gemfile.lock
 2018-03-22 11:04:03 +00:00
Jacob Vosmaer 008a6a6ce6 Route path lookups through legacy_disk_path 2018-03-21 18:18:32 +01:00
Yorick Peterse baaef4a6a9 Merge branch 'ab-44446-add-indexes-for-user-activity-queries' into 'master' 
Add indexes for user activity queries.

Closes #44446

See merge request gitlab-org/gitlab-ce!17890
 2018-03-21 15:37:52 +00:00
James Lopez 140cb0c092 Merge branch 'fix/auth0-unsafe-login-10-6' into 'security-10-6' 
[10.6] Fix GitLab Auth0 integration signs in the wrong user

See merge request gitlab/gitlabhq!2354
 2018-03-21 14:43:47 +00:00
Douwe Maan 95ced3bb5f Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6' 
Server Side Request Forgery in Services and Web Hooks

See merge request gitlab/gitlabhq!2337
 2018-03-21 14:39:21 +00:00
Andreas Brandl 1059b3ab27 Guard creation/removal with existence checks. 2018-03-21 13:41:24 +01:00
Andreas Brandl 5f8abe4783 Flip column order in new index. 2018-03-21 13:41:24 +01:00
Andreas Brandl c0bfe9db5f Patch MySQL's odd foreign key behavior. 2018-03-21 13:41:24 +01:00
Andreas Brandl 58a99463b6 Add indexes for user activity queries. 
Closes #44446.
 2018-03-21 13:41:24 +01:00
Andreas Brandl c914883a2b Shortcut concurrent foreign key creation if already exists. 
Closes #43887.
 2018-03-20 18:44:00 +01:00
Andreas Brandl fb6d6fce5a Address review comments. 2018-03-16 13:35:27 +01:00
Andreas Brandl 4c1e6fd0e8 Simplify migration and add NOT NULL to project_id. 2018-03-16 13:35:27 +01:00
Andreas Brandl 3a8207a961 Use bigserial for internal_ids table. 2018-03-16 13:35:26 +01:00
Andreas Brandl 754272e392 Atomic generation of internal ids for issues. 2018-03-16 13:35:25 +01:00