delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master'	Rémy Coutable	2016-04-15	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Make /profile/keys/new redirects to /profile/keys for back-compat This addresses https://github.com/gitlabhq/gitlabhq/issues/10138. See merge request !3717
\| *	Make /profile/keys/new redirects to /profile/keys for back-compat	Rémy Coutable	2016-04-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Report: https://github.com/gitlabhq/gitlabhq/issues/10138 Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'auto-fsck' into 'master'	Robert Speicher	2016-04-14	3	-1/+15
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Auto git fsck Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232 See merge request !3232
\| *	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck	Jacob Vosmaer	2016-04-13	4	-0/+28
\| \|\
\| * \|	Clear repository check columns asynchronously	Jacob Vosmaer	2016-04-13	1	-1/+1
\| \| \|
\| * \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck	Jacob Vosmaer	2016-04-12	8	-9/+50
\| \|\ \
\| * \| \|	Move 'clear checks' button to applicatoin settings	Jacob Vosmaer	2016-04-12	1	-4/+1
\| \| \| \|
\| * \| \|	Rename almost all the things	Jacob Vosmaer	2016-04-06	3	-6/+6
\| \| \| \|
\| * \| \|	Rebase repo check MR	Jacob Vosmaer	2016-04-04	3	-1/+18
\| \| \| \|
* \| \| \|	Merge branch 'redis_config_consistency' into 'master'	Valery Sizov	2016-04-13	2	-5/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redis configuration consistency Related https://gitlab.com/gitlab-org/gitlab-ce/commit/cf669551f69edd66913d22c96cf1de1302e7990e See merge request !3697
\| * \| \| \|	Redis configuration consistencyredis_config_consistency	Valery Sizov	2016-04-13	2	-5/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'async-related-mrs' into 'master'	Rémy Coutable	2016-04-13	1	-0/+2
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load related MRs/branches asynchronously cc @dzaporozhets See merge request !3678
\| * \| \| \|	Load related MRs/branches asynchronously	Yorick Peterse	2016-04-13	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \|	Merge branch 'external-omniauth-providers' into 'master'	Marin Jankovski	2016-04-13	2	-0/+8
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \|	Documentation of feature	Patricio Cano	2016-04-11	1	-0/+7
\| \| \| \| \|
\| * \| \| \|	Allow `external_providers` for Omniauth to be defined to mark these users as ↵	Patricio Cano	2016-04-11	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	external
* \| \| \| \|	Merge branch 'rs-archive-cache-worker-cron' into 'master'	Dmitriy Zaporozhets	2016-04-13	2	-0/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move RepositoryArchiveCacheWorker to sidekiq-cron Closes #15105 See merge request !3663
\| * \| \| \| \|	Move RepositoryArchiveCacheWorker to sidekiq-cronrs-archive-cache-worker-cron	Robert Speicher	2016-04-12	2	-0/+6
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15105
* \| \| \| \|	Add changelog entries, install docs, and gitlab.yml.example entry for the ↵	DJ Mountney	2016-04-12	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	trusted_proxies setting
* \| \| \| \|	Adjust the default trusted_proxies to only include localhost, and allow ↵	DJ Mountney	2016-04-12	2	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	other trusted proxies to be configured.
* \| \| \| \|	Merge branch 'decouple-member-notification' into 'master'	Douwe Maan	2016-04-12	1	-0/+2
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \|	Simplify Projects::NotificationSettingsController	Douglas Barbosa Alexandre	2016-04-12	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into decouple-member-notification	Douglas Barbosa Alexandre	2016-04-11	7	-10/+13
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Use singular resource for NotificationSetting	Douglas Barbosa Alexandre	2016-04-08	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since a user cannot have multiple NotificationSettings records for one group/project we can use singular resource.
\| * \| \| \|	Merge branch 'master' into decouple-member-notification	Douglas Barbosa Alexandre	2016-04-08	5	-9/+14
\| \|\ \ \ \
\| * \| \| \| \|	Change how notification settings in profile are rendered and updated	Dmitriy Zaporozhets	2016-03-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Create NotificationSettings object only when user change value in dropdown	Dmitriy Zaporozhets	2016-03-30	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'instrument-service-classes' into 'master'	Rémy Coutable	2016-04-12	1	-0/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instrument all service classes This will help us see where (mostly) Sidekiq code is spending time. See merge request !3675
\| * \| \| \| \| \|	Instrument all service classesinstrument-service-classes	Yorick Peterse	2016-04-12	1	-0/+12
\| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes gitlab-org/gitlab-ce#15162
* \| \| \| \| \|	Un-instrument Banzai::ReferenceExtractoruninstrument-banzai-reference-extractor	Yorick Peterse	2016-04-12	1	-3/+0
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \|	Instrument Banzai code	Yorick Peterse	2016-04-11	1	-0/+23
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Enable asset compression in production.	connorshea	2016-04-09	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`config.assets.compress` needed to be explicitly enabled. Follow-up to !3544. Resolves #14344.
* \| \| \|	Merge branch 'rs-update-rails' into 'master'	Robert Speicher	2016-04-09	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump rails to 4.2.6 See merge request !3424
\| * \| \| \|	Bump rails to 4.2.6rs-update-rails	Robert Speicher	2016-04-05	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'redis-connection-pool' into 'master'	Robert Speicher	2016-04-08	4	-10/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \|	Put CACHE_NAMESPACE in the Gitlab::Redis module	Jacob Vosmaer	2016-04-07	1	-3/+1
\| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Add Gitlab::Redis connection pool	Jacob Vosmaer	2016-04-04	4	-7/+7
\| \|/ / /
* \| \| \|	Instrument Rails cache codeinstrument-rails-cache	Yorick Peterse	2016-04-08	1	-0/+1
\| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	This allows us to track how much time of a transaction is spent in dealing with cached data.
* \| \|	Remove dumb debug statement and add many tests.	Jacob Schatz	2016-04-07	2	-2/+1
\| \| \|
* \| \|	Add optional colon.	Jacob Schatz	2016-04-07	1	-1/+2
\| \| \|
* \| \|	Merge branch 'feature/expose-builds-badge' into 'master'	Rémy Coutable	2016-04-07	1	-3/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expose badges This MR exposes badge somewhere in visible place. ![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png) Closes #13801 See merge request !3326
\| * \| \|	Add project badges view prototype	Grzegorz Bizon	2016-04-06	1	-1/+1
\| \| \| \|
\| * \| \|	Improve routes for project badges	Grzegorz Bizon	2016-04-06	1	-3/+4
\| \| \| \|
* \| \| \|	Merge branch 'saml-external-groups' into 'master'	Robert Speicher	2016-04-07	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \|	Added documentation	Patricio Cano	2016-04-06	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Config examples	Patricio Cano	2016-04-04	1	-0/+2
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'patch/fix-markdown-preview-wikis' into 'master'	Robert Speicher	2016-04-07	1	-0/+1
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Add specific markdown_preview route for Wikis	Gabriel Mazetto	2016-03-30	1	-0/+1
\| \| \|/ \| \|/\|
* \| \|	Premailer shouldn't remove script tags from our emails	Robert Speicher	2016-04-05	1	-1/+2
\| \|/ \|/\| \| \| \| \|	Closes #14943.
* \|	Remove "Congratulations!" tweet button on newly-created project.	connorshea	2016-03-31	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	I’ve removed everything related to the feature based on this commit: ce08f919f34fd8849834365 Resolves #10857.