Commit Graph
1578 Commits
Author SHA1 Message Date
Phil HughesandRobert Speicher 50ed43e490 Improved confirmation UX
Closes #4228
2016-04-21 20:20:09 -04:00
Yorick Peterse c5cb68fd03 Instrument Gitlab::GitAccess/GitAccessWiki 2016-04-21 19:15:32 +02:00
Tomasz Maczukin bf4371d60d Switch raw trace to use X-Sendfile header 2016-04-19 23:17:49 +02:00
Tomasz Maczukin 27d1349f2b Add raw trace output for GitLab Workhorse 2016-04-19 23:17:49 +02:00
P.S.V.R 3d6ba3b107 Add support to cherry-pick any commit
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785
Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
2016-04-18 15:39:07 +08:00
Rémy Coutable ddec8e777f Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master'
Make /profile/keys/new redirects to /profile/keys for back-compat

This addresses https://github.com/gitlabhq/gitlabhq/issues/10138.

See merge request !3717
2016-04-15 08:19:01 +00:00
Rémy Coutable a434ffd3b3 Make /profile/keys/new redirects to /profile/keys for back-compat
Report: https://github.com/gitlabhq/gitlabhq/issues/10138

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-15 09:45:58 +02:00
Robert Speicher 95a867e0af Merge branch 'auto-fsck' into 'master'
Auto git fsck

Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232

See merge request !3232
2016-04-14 17:15:58 +00:00
Valery Sizov c0678f2d28 Merge branch 'redis_config_consistency' into 'master'
Redis configuration consistency

Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e

See merge request !3697
2016-04-13 18:34:11 +00:00
Valery Sizov 2244aaf98f Redis configuration consistency 2016-04-13 20:57:19 +03:00
Rémy Coutable c414e4342b Merge branch 'async-related-mrs' into 'master'
Load related MRs/branches asynchronously

cc @dzaporozhets 

See merge request !3678
2016-04-13 16:06:36 +00:00
Jacob Vosmaer f07316f27c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-13 17:38:59 +02:00
Yorick Peterse 31e28ebceb Load related MRs/branches asynchronously
Currently this works by loading the HAML partials via XHR. While this is
not the nicest setup it _is_ the easiest setup using the tools we
currently have.

Loading this data asynchronously doesn't make loading the related
MRs/branches itself faster, it merely ensures that loading the issue
itself is not slowed down.

Fixes gitlab-org/gitlab-ce#14949
2016-04-13 17:24:21 +02:00
Jacob Vosmaer 0f602be99f Clear repository check columns asynchronously 2016-04-13 15:56:05 +02:00
Marin Jankovski c746046992 Merge branch 'external-omniauth-providers' into 'master'
Allow Omniauth providers to be marked as external

Related to #4009 

With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login.

MR for Omnibus: gitlab-org/omnibus-gitlab!727

/cc @dblessing @DouweM 

See merge request !3657
2016-04-13 13:09:47 +00:00
Dmitriy Zaporozhets ab4ea3720c Merge branch 'rs-archive-cache-worker-cron' into 'master'
Move RepositoryArchiveCacheWorker to sidekiq-cron

Closes #15105

See merge request !3663
2016-04-13 12:53:01 +00:00
DJ Mountney bb372ac97f Add changelog entries, install docs, and gitlab.yml.example entry for the trusted_proxies setting 2016-04-12 10:42:59 -07:00
DJ Mountney 38cff18af0 Adjust the default trusted_proxies to only include localhost, and allow other trusted proxies to be configured. 2016-04-12 10:42:59 -07:00
Douwe Maan 4516f40dfe Merge branch 'decouple-member-notification' into 'master'
Decouple membership and notifications

This allow you to have notification setting per project even if you are member of group. 
It also creates background for having notification settings in project you are not member of. 


- [x] Make it work
- [x] Migrations
- [x] CHANGELOG
- [x] More tests
- [x] API

For #3359 

After this merge request there is still some work to be done: 

* create migration that remove duplicates in notification settings table and create uniq index (8.8 probably)
* remove notification_level field from Member model in 9.0
* make proper API for notification settings
* use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) 
* maybe more tests 


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

See merge request !3421
2016-04-12 16:39:40 +00:00
Jacob Vosmaer 7b1bb0f4db Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-12 17:44:02 +02:00
Jacob Vosmaer ea787165b3 Move 'clear checks' button to applicatoin settings 2016-04-12 17:32:58 +02:00
Robert Speicher cba2c437e5 Move RepositoryArchiveCacheWorker to sidekiq-cron
Closes #15105
2016-04-12 11:12:05 -04:00
Douglas Barbosa Alexandre ef22b76b73 Simplify Projects::NotificationSettingsController 2016-04-12 12:10:58 -03:00
Rémy Coutable 0b8852d3c4 Merge branch 'instrument-service-classes' into 'master'
Instrument all service classes

This will help us see where (mostly) Sidekiq code is spending time.

See merge request !3675
2016-04-12 14:39:54 +00:00
Yorick Peterse b3d8b995c3 Un-instrument Banzai::ReferenceExtractor
Instrumenting this class together with Gitlab::ReferenceExtractor causes
a StackError for some reason. Since Gitlab::ReferenceExtractor has most
of the interesting code we'll only instrument that class.
2016-04-12 14:10:35 +02:00
Yorick Peterse 8299129382 Instrument all service classes
Fixes gitlab-org/gitlab-ce#15162
2016-04-12 12:24:16 +02:00
Yorick Peterse 935f913165 Instrument Banzai code 2016-04-11 17:43:12 +02:00
Patricio Cano cedfe9d228 Documentation of feature 2016-04-11 10:16:56 -05:00
Patricio Cano 12e6084667 Allow external_providers for Omniauth to be defined to mark these users as external 2016-04-11 10:16:15 -05:00
Douglas Barbosa Alexandre 9a44d6977a Merge branch 'master' into decouple-member-notification 2016-04-11 10:34:49 -03:00
connorshea 44d9f52fd9 Enable asset compression in production.
`config.assets.compress` needed to be explicitly enabled.

Follow-up to !3544. Resolves #14344.
2016-04-09 16:31:41 -06:00
Robert Speicher 955d027d17 Merge branch 'rs-update-rails' into 'master'
Bump rails to 4.2.6

See merge request !3424
2016-04-09 04:07:48 +00:00
Robert Speicher 93571c4335 Merge branch 'redis-connection-pool' into 'master'
Redis connection pool

Split from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232

Having an easily accessible Redis connection pool allows us to do more
cool stuff with Redis in GitLab (instead of having to go through e.g.
the Rails cache).

See merge request !3521
2016-04-08 22:26:53 +00:00
Douglas Barbosa Alexandre 069724cef5 Use singular resource for NotificationSetting
Since a user cannot have multiple NotificationSettings records for one
group/project we can use singular resource.
2016-04-08 17:11:13 -03:00
Douglas Barbosa Alexandre 7afeace354 Merge branch 'master' into decouple-member-notification 2016-04-08 15:48:09 -03:00
Yorick Peterse c56f702ec3 Instrument Rails cache code
This allows us to track how much time of a transaction is spent in
dealing with cached data.
2016-04-08 17:54:52 +02:00
Jacob Vosmaer cf669551f6 Put CACHE_NAMESPACE in the Gitlab::Redis module 2016-04-07 15:42:07 +02:00
Jacob Schatz 0bbeebc8f9 Remove dumb debug statement and add many tests. 2016-04-07 08:47:29 -04:00
Jacob Schatz 8172d2c1f2 Add optional colon. 2016-04-07 08:17:05 -04:00
Rémy Coutable 8eae7b1088 Merge branch 'feature/expose-builds-badge' into 'master'
Expose badges

This MR exposes badge somewhere in visible place.

![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png)

Closes #13801

See merge request !3326
2016-04-07 08:40:15 +00:00
Robert Speicher 936be025cd Merge branch 'saml-external-groups' into 'master'
Allow SAML to identify external users and set them as such

Related to #4009

Fixes #14577

This allows SAML to retrieve group information form the `SAML Response`
and match that to a setting that will flag all matching users as external.

See merge request !3530
2016-04-07 00:35:08 +00:00
Robert Speicher 730625f022 Merge branch 'patch/fix-markdown-preview-wikis' into 'master'
Wiki preview URL converting problem [via Markdown]

Current implementation when rendering the preview, thinks relative links are for project repository files.

We are creating a new preview route that will define correct context data to render for wikis instead.

Fixes #2380, #1184

See merge request !3461
2016-04-07 00:17:21 +00:00
Patricio Cano b95ac0962c Added documentation 2016-04-06 16:04:11 -05:00
Grzegorz Bizon 88fc7ccdda Add project badges view prototype 2016-04-06 19:56:34 +02:00
Grzegorz Bizon ea69037831 Improve routes for project badges 2016-04-06 19:56:34 +02:00
Jacob Vosmaer 5cf56e5647 Rename almost all the things 2016-04-06 13:47:05 +02:00
Robert Speicher ee1de011d1 Premailer shouldn't remove script tags from our emails
Closes #14943.
2016-04-05 17:03:34 -04:00
Robert Speicher 5ff9d2a182 Bump rails to 4.2.6 2016-04-05 13:07:53 -04:00
Patricio Cano 943d8d4b90 Config examples 2016-04-04 19:10:17 -05:00
Jacob Vosmaer bf9526739b Rebase repo check MR 2016-04-04 17:23:43 +02:00