home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 21:16:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
29,221 Commits 48 Branches 340 Tags
c593154cb4f0215851fbbae1dde753dacbaa6713
Commit Graph
884 Commits
Author SHA1 Message Date
Yorick Peterse 0ba21860c5 Merge branch 'issue_3359' into 'master' 
Remove duplicated notification settings and add unique index

See merge request !4472
 2016-06-06 19:14:01 +00:00
Timothy Andrew 791cc9138b Add a U2fRegistrations table/model. 
- To hold registrations from U2F devices, and to authenticate them.
- Previously, `User#two_factor_enabled` was aliased to the
  `otp_required_for_login` column on `users`.
- This commit changes things a bit:
    - `User#two_factor_enabled` is not a method anymore
    - `User#two_factor_enabled?` checks both the
      `otp_required_for_login` column, as well as `U2fRegistration`s
    - Change all instances of `User#two_factor_enabled` to
      `User#two_factor_enabled?`
- Add the `u2f` gem, and implement registration/authentication at the
  model level.
 2016-06-06 12:50:31 +05:30
Felipe Artur 8450fe3074 Add index to notification settings 2016-06-03 16:46:10 -03:00
Z.J. van de Weg 9d491712cf Merge branch 'master' into awardables 2016-06-03 15:20:11 +02:00
Z.J. van de Weg 91a7b9333b Incorportate feedback 2016-06-01 12:10:08 +02:00
Stan Hu e87149a12b Merge branch 'remove-dangling-notification-settings' into 'master' 
Remove project notification settings associated with deleted projects

On GitLab.com, there are 1560 project notification settings with no valid project all created on 2016-04-15 10:38:53 for some reason. This migration should purge
those entries.
    
b8f38437 should prevent this issue from occurring in the first place.
    
Closes gitlab-com/support-forum#678


See merge request !4311
 2016-05-31 16:51:04 +00:00
Stan Hu 4da0778157 Remove project notification settings associated with deleted projects 
On GitLab.com, there are 1560 project notification settings with no valid project
all created on 2016-04-15 10:38:53 for some reason. This migration should purge
those entries.

b8f38437 should prevent this issue from occurring in the first place.

Closes gitlab-com/support-forum#678
 2016-05-31 08:50:18 -07:00
Kamil Trzcinski 000585be1b Remove update of container_registry_token_expire_delay 
This is not needed when we specify a default.
 2016-05-31 15:51:45 +02:00
Kamil Trzcinski b1a21a9986 Set container_registry_token_expire_delay default to 5 2016-05-31 15:20:46 +02:00
Kamil Trzcinski f517aa49e1 Fix migration information 2016-05-31 13:49:48 +02:00
Kamil Trzcinski 041b021507 Update db/schema.rb 2016-05-31 13:27:09 +02:00
Kamil Trzcinski 846d111f1d Add Application Setting to configure Container Registry token expire delay (default 5min) 2016-05-31 13:23:13 +02:00
ZJ van de Weg cbd7801b3d Merge branch 'master' into awardables 2016-05-30 18:54:08 +02:00
Stan Hu 9485b65abb Add DB index on users.state 
Closes #17920
 2016-05-29 23:03:08 -07:00
James Lopez e60d5f9188 fix rescue block on migration 2016-05-27 17:20:15 +02:00
Josh Frye 6d2a0a6b9b Remove main_language and tests 2016-05-25 17:16:42 -04:00
ZJ van de Weg 7ae536002a Merge branch 'master' into awardables 2016-05-25 14:41:25 +02:00
Douwe Maan 983b592cb7 Merge branch 'issue_14632' into 'master' 
Fix group visibility level migration in case all visibility levels are restricted

fixes #14632 

See merge request !4107
 2016-05-20 21:05:18 +00:00
Yorick Peterse 1472bb9247 Updated the DB schema 2016-05-19 23:13:51 -05:00
Felipe Artur 260a915cb0 Fix group visibility level migration in case all visibility levels are restricted 2016-05-19 20:08:08 -04:00
Grzegorz Bizon 52c8b9da37 Use migration helper to prevent downtime migration 2016-05-19 22:11:40 +02:00
Grzegorz Bizon 3b0eeccc03 Add not null constraint to run untagged runner option 2016-05-19 22:01:53 +02:00
Grzegorz Bizon d0032935a1 Add runner db field for ability to run untagged jobs 2016-05-19 22:01:53 +02:00
Rubén Dávila 0c47b68d04 Mask credentials from URL when import of project has failed. 2016-05-18 21:16:36 -05:00
Fatih Acet bb883387f9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/note.rb
#	db/schema.rb
#	spec/models/note_spec.rb
 2016-05-18 13:05:53 -05: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
Felipe Artur ecce94d3aa fix default send confirmation value 2016-05-16 16:53:11 -03: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 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
Douwe Maan 7fc51d1908 Merge branch 'health-check-route' 
# Conflicts:
#	db/schema.rb
 2016-05-12 16:39:03 -05:00
Andrei Gliga d66833bca5 schema fix 😓 2016-05-12 13:56:04 +03:00
Andrei Gliga 9e5042e40f Revert "disabled_oauth_sign_in_sources column" and keep on schema only the disabled_oauth_sign_in_sources column 
This reverts commit 95358e0095403ad44149d11922d52e4590285a20.
 2016-05-12 13:44:46 +03:00
Andrei Gliga 7db3fb5a0b disabled_oauth_sign_in_sources column 2016-05-12 13:44:46 +03:00
Zeger-Jan van de Weg 4558b5b9fe Incorporate feedback 2016-05-11 22:43:58 +02:00
Zeger-Jan van de Weg 7e6dcf9cd0 Merge branch 'master' into awardables 2016-05-11 08:47:04 +02:00
DJ Mountney 160ef66d1b Add health_check access token, and enforce on the health_check endpoint 
Also added a health check page to the admin section for resetting the token.
 2016-05-10 08:46:02 -07:00
Zeger-Jan van de Weg dccf8a9fc8 Add tests on Awardables and Award Emoji 2016-05-10 12:03:13 +02:00
Kamil Trzcinski 0094d8f196 Rename images to container_registry 2016-05-09 20:29:57 +03:00
Kamil Trzcinski 71da2e0b56 Merge remote-tracking branch 'origin/master' into docker-registry 2016-05-09 20:21:02 +03:00
Robert Speicher 0e29653f51 Remove wall_enabled field from Project 2016-05-08 15:47:42 -04:00
Dmitriy Zaporozhets 235d70da73 Update db/schema.rb after running db:migrate:reset 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-06 16:33:23 +02:00
Zeger-Jan van de Weg 3bdc57f0a7 Create table for award emoji 2016-05-06 10:47:11 +02:00
Stan Hu b9672d4b38 Limit the number of merge requests per project to avoid long seeds 
This step was taking a long time because seed_fu creates N / 2 merge requests
for each repo, where N is the number of branches for that repo. At the time of
this writing, there are 234 branches on the gitlab-ce repo, leading to 117
merge requests.
 2016-05-04 09:22:01 -07:00
Gabriel Mazetto 0cd5edf35c Backported minimal safewebhook implementation to GitLab CE 2016-04-30 05:04:10 -03:00
Kamil Trzcinski f41a3e24d2 Added authentication service for docker registry 2016-04-29 16:45:00 +02:00
Jacob Vosmaer b80bf57d37 Disable 'repository check' feature in 8.7.0 
It still causes too many false alarms.
 2016-04-21 16:50:26 +02:00