home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
29,750 Commits 48 Branches 340 Tags
dc2ca594331ff532b1bbb0ba53725644dc4cdc41
Commit Graph
901 Commits
Author SHA1 Message Date
Felipe Artur 2979d3ca1b Implement custom notification level options 2016-06-13 15:51:11 -03:00
Douwe Maan c03f125904 Merge branch 'issue_3359_2' into 'master' 
Remove notification level from user model

part of #3359 

See merge request !4494
 2016-06-13 11:52:39 +00:00
Felipe Artur 39ead205de Remove notification level fild from users, improve migrations and specs 2016-06-10 11:49:30 -03:00
Felipe Artur 8f6d43e0fe Remove notification level from user model 2016-06-10 10:58:13 -03:00
Paco GuzmanandYorick Peterse 136a4ea39b Cache the presence of an issue_tracker at project level 
Using update_column to store the boolean flag to avoid
any side effects with the current state of the project
instance
 2016-06-10 15:41:56 +02:00
Rémy Coutable 5324c93643 Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergeable_ci_state? 
The logic of the method was obviously inverted.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-10 14:37:32 +02:00
Rui AndersonandRémy Coutable 07dbd6b388 Allow or not merge MR with failed build 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-10 14:36:54 +02:00
Sean McGivern 98bb435f42 Enable RuboCop for migrations 
Migrations shouldn't fail RuboCop checks - especially lint checks, such
as the nested method check. To avoid changing code in existing
migrations, add the magic comment to the top of each of them to skip
that file.
 2016-06-09 16:05:25 +01:00
Sean McGivern 40b6d9064a Allow custom text on 'almost there' page 
Add a new application setting, after_sign_up_text. This is text to be
rendered as Markdown and shown on the 'almost there' page after a user
signs up, but before they've confirmed their account.

Tweak the styles for that page so that centered lists look reasonable.
 2016-06-08 19:08:53 +01:00
Yorick Peterse 3883bc05d2 Remove notification settings in batches 
This improves performance of the duplicate notification settings
migration by removing duplicates in batches instead of using one big
"DELETE FROM" query.

The previous query would locally run over 45 minutes without even
finishing. This new setup finished in a matter of seconds.

Fixes #18289
 2016-06-08 16:20:42 +02:00
Jacob Schatz 5b83abcc01 Merge branch 'issue_14189' into 'master' 
Ability to prioritize labels

Closes #14189 

See merge request !4009
 2016-06-07 15:15:07 +00:00
Kamil Trzcinski 6e64d1ac76 Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 2016-06-07 10:26:27 +02:00
Connor Shea efb7da68e6 Fix missed colorize methods. 2016-06-06 15:32:36 -06:00
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
Thijs WoutersandAlfredo Sumaran d8263b2851 Sort by label priority 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-06 11:59:49 -05:00
Kamil Trzcinski d9b292f872 Merge remote-tracking branch 'origin/master' into rename-ci-commit 
# Conflicts:
#	spec/features/builds_spec.rb
 2016-06-06 16:33:52 +02:00
Kamil Trzcinski 7ad7e10fee Merge remote-tracking branch 'origin/master' into rename-ci-commit 2016-06-06 11:20:17 +02: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
Kamil Trzcinski 08baa9983e Use pipelines in context of Project 2016-06-03 13:34:03 +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