Commit Graph
510 Commits
Author SHA1 Message Date
Douwe Maan a8aa59e96e Inline mailer CSS using premailer.
# Conflicts:
#	Gemfile.lock
2016-03-19 20:04:10 +01:00
Hiroyuki Sato 8acad49fe0 Support Wiki with UTF-8 page name 2016-03-16 02:17:07 +09:00
Stan Hu 74d7de8196 Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""
This reverts commit 5a586f364c
2016-03-12 21:05:23 +00:00
Douwe Maan 5a586f364c Revert "Merge branch 'support-go-subpackages' into 'master' "
This reverts merge request !3191
2016-03-12 17:42:51 +00:00
Douwe Maan 826bc72c12 Merge branch 'support-go-subpackages' into 'master'
Support Golang subpackage fetching

Closes #13805

See merge request !3191
2016-03-12 17:38:08 +00:00
Stan Hu cc065fbeaa Support Golang subpackage fetching
Closes #13805
2016-03-12 01:09:37 -08:00
Douwe Maan cb81c8a5ef Merge branch 'rs-issue-12944' into 'master'
Use a custom Devise failure app to handle unauthenticated .zip requests

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944

See merge request !2828
2016-03-11 22:34:33 +00:00
Yorick PeterseandRobert Speicher 12082db41e Disable Rubocop for PostgreSQL patches
This code is mostly a copy-paste from existing pull requests so there's
no point in running Rubocop on it.
2016-03-11 15:25:23 -05:00
Yorick PeterseandRobert Speicher d38dcf1e3b Patch MySQL to ignore PostgreSQL schema options
This ensures that options such as `using: :gin` and PostgreSQL operator
classes are ignored when loading a schema into a MySQL database.
2016-03-11 15:25:22 -05:00
Yorick PeterseandRobert Speicher 49e122df85 Backport Rails support for PostgreSQL opclasses
This is needed to support creating/dumping/loading indexes that use the
gin_trgm_ops operator class on PostgreSQL. These changes are taken from
Rails pull request https://github.com/rails/rails/pull/19090.
2016-03-11 15:25:22 -05:00
Jacob Vosmaer c46e6eff10 Parse config/resque.yml in one place only 2016-03-09 15:16:46 +01:00
Robert Speicher 5844a21a0a Use a custom Devise failure app to handle unauthenticated .zip requests
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
2016-03-08 23:49:30 -05:00
Douwe Maan 8ec49e47ec Merge branch 'mail-room-config-without-rails' into 'master'
Don't load all of GitLab in mail_room

Fixes #12731

cc @jacobvosmaer 

See merge request !3005
2016-03-02 10:43:57 +00:00
Artem Sidorenko 28ba8ed5f5 Use dedicated relative_url.rb initializer
in order to have it the same way like in omnibus
2016-02-29 21:17:48 +01:00
Douwe Maan bbdb9ba036 Don't load all of GitLab in mail_room
Fixes #12731
2016-02-26 18:48:13 -08:00
Patricio Cano 99edb2a0aa Properly set auto_link_saml_user default value in the Settings loader. 2016-02-22 11:59:15 -05:00
Robert Speicher 6c9ae675b5 Add release tracking for Sentry 2016-02-17 14:05:58 -05:00
Artem V. Navrotskiy e080fdad6e Change default smpt port to 465 (default smtps port) 2016-02-09 07:30:06 +03:00
Yorick Peterse 33fb55a572 Instrument various Rugged constants 2016-02-01 15:03:58 +01:00
Yorick Peterse 1256dabb44 Instrument all Gitlab::Git instance methods 2016-02-01 13:54:39 +01:00
Robert Speicher 79123ec998 Revert "Revert "Remove the :coffee and :coffeescript Haml filters""
This reverts commit b0145d765b.
2016-01-28 14:29:09 -05:00
Blake Hitchcock 4be65c3231 Update ExternalIssue regex for JIRA integration
The pattern in the `::reference_pattern` class method in the
ExternalIssue model does not match all valid forms of JIRA project
names. I have updated the regex to match JIRA project names with numbers
and underscores. More information on valid JIRA project names can be
found here:
https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html

* The first character must be a letter,
* All letters used in the project key must be from the Modern Roman Alphabet and upper case, and
* Only letters, numbers or the underscore character can be used.
2016-01-26 15:55:40 -05:00
Valery Sizov 446fed4d83 monkey patch for mysql 5.7 2016-01-25 16:52:00 +02:00
Yorick Peterse 7d1b51fac1 Instrument Gitlab::Git::Repository
This adds instrumentation for the instance methods of
Gitlab::Git::Repository.
2016-01-21 11:27:31 +01:00
Jeroen Nijhof 7a609858f0 Use sentry in env production only 2016-01-20 09:48:38 +01:00
Jeroen Nijhof 7658a64469 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into sentry-integration
Conflicts:
	db/schema.rb
2016-01-20 09:07:10 +01:00
Jeroen Nijhof 85e0fce9ee Add sentry integration 2016-01-18 17:15:10 +01:00
Rémy Coutable 2723dea667 Ensure Gravatar host looks like an actual host 2016-01-18 14:58:16 +01:00
Yorick Peterse 8c4210e676 Added metrics instrumentation for all finders 2016-01-18 11:54:22 +01:00
Douwe Maan c7d9e7806a Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master'
Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL;

https://github.com/gitlabhq/gitlabhq/pull/9964

@DouweM

See merge request !2383
2016-01-13 14:21:32 +00:00
Robert Speicher b0145d765b Revert "Remove the :coffee and :coffeescript Haml filters"
This reverts commit ae7de2f851.
2016-01-12 16:30:38 -05:00
Jason Lee 932a247f5f Use CGI.escape instead of URI.escape, because URI is obsoleted.
ref: https://github.com/ruby/ruby/commit/238b979f1789f95262a267d8df6239806f2859cc
2016-01-12 18:20:03 +08:00
Robert Speicher ae7de2f851 Remove the :coffee and :coffeescript Haml filters
See https://git.io/vztMu and http://stackoverflow.com/a/17571242/223897
2016-01-11 21:48:20 -05:00
Drew Blessing 67aa0b8c4c Optimize LDAP and add a search timeout 2016-01-11 08:17:32 -06:00
Robert Speicher fa36749bce Add two custom Date/Time conversion formats 2016-01-07 20:01:08 -05:00
Yorick Peterse 66a997a914 Track total query/view timings in transactions 2016-01-04 12:14:36 +01:00
Yorick Peterse cafc784ee1 Removed tracking of hostnames for metrics
This isn't hugely useful and mostly wastes InfluxDB space. We can re-add
this whenever needed (but only once we really need it).
2015-12-31 17:55:10 +01:00
Yorick Peterse a6c60127e3 Removed tracking of raw SQL queries
This particular setup had 3 problems:

1. Storing SQL queries as tags is very inefficient as InfluxDB ends up
   indexing every query (and they can get pretty large). Storing these
   as values instead means we can't always display the SQL as easily.
2. We already instrument ActiveRecord query methods, thus we already
   have timing information about database queries.
3. SQL obfuscation is difficult to get right and I'd rather not expose
   sensitive data by accident.
2015-12-31 17:14:02 +01:00
Gabriel Mazetto 82bfa8f40c Added additional config environmental variables to help Debian packaging
* GITLAB_EMAIL_FROM
* GITLAB_EMAIL_DISPLAY_NAME
* GITLAB_EMAIL_REPLY_TO
2015-12-30 12:45:24 -02:00
Gabriel Mazetto a3469d914a reCAPTCHA is configurable through Admin Settings, no reload needed. 2015-12-28 18:50:29 -02:00
Yorick Peterse 4d925f2147 Move InfluxDB settings to ApplicationSetting 2015-12-28 18:00:32 +01:00
Dmitriy Zaporozhets 540eb0a9af Merge branch 'influxdb' into 'master'
Storing of application metrics in InfluxDB

This adds support for tracking metrics in InfluxDB, which in turn can be visualized using Grafana. For more information see #2936.

See merge request !2042
2015-12-28 13:42:15 +00:00
Dmitriy Zaporozhets c08cb923ec Merge branch 'environment-variables-in-the-app' into 'master'
Environment variables in the app

Fixes #3717 and #3519 

## Why environment variables?

We need environmental variables, they are an expected way to configure apps https://medium.com/@kelseyhightower/12-fractured-apps-1080c73d481c#.ntrdiyu4c

This causes many tools and to tutorials to make it easy to set environmental variables and harder to supply a configuration file. 

So even though we agree they are not ideal https://support.cloud.engineyard.com/hc/en-us/articles/205407508-Environment-Variables-and-Why-You-Shouldn-t-Use-Them the market has spoken.

## Why for GitLab the application and not for the Omnibus packages?

Environmental variables are also needed by people that do not run our Omnibus packages, for example natively bundled apps (Debian apt-get) and idiomatic Docker packages (Mesos, Kubernetes, etc.).

Of course it should work great with Omnibus packages too so any advise is welcome in that regard.

There is an MR https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/575/diffs to be able to set any variable in gitlab.rb via environmental variables. I think both that and this MR should be merged to solve the configuration problem for both Omnibus and non-Omnibus installations. When both are merged the documentation should be crosslinked.

## Why uppercase?

Need to be all cap according to Google Shell guideline:
"Constants and Environment Variable Names => All caps, separated with underscores, declared at the top of the file."
https://google.github.io/styleguide/shell.xml#Constants_and_Environment_Variable_Names

Or as explained on http://stackoverflow.com/a/673940/613240
Keeping to this convention, you can rest assured that you don't need to know every environment variable used by UNIX tools or shells in order to avoid overwriting them. If it's your variable, lowercase it. If you export it, uppercase it.

/cc @JobV @DouweM @marin @jacobvosmaer @ayufan @pravi

See merge request !2215
2015-12-28 12:44:03 +00:00
Stan Hu 9e0f532f3e Add documentation for using reCAPTCHA 2015-12-27 20:38:44 -08:00
Stan Hu 9f7d379c2a Add support for Google reCAPTCHA in user registration to prevent spammers 2015-12-27 09:04:11 -08:00
Sytse Sijbrandij 4ebd447a05 Use environment variables to configure GitLab. 2015-12-27 17:36:08 +01:00
Gabriel Mazetto a7a52f7567 Hotfix for sidekiq-cron being loaded from Settingslogic with defaults 2015-12-22 13:02:42 -02:00
Dmitriy Zaporozhets e6e338f00e Merge branch 'feature/sidekiq-cron-config' into 'master'
Sidekiq-cron configuration moved to gitlab.yml

When `sidekiq-cron` was introduced, jobs configuration where placed
in `schedule.yml` file.

As discussed in #3928, this is not desirable. 
We moved it to `gitlab.yml`, exposing only the "cron" part of the configuration.

See merge request !2087
2015-12-22 09:49:47 +00:00
Robert Speicher 9570495e75 Merge branch 'add_email_unlock' into 'master'
Allow account unlock via email

We see a lot of users get confused about what it means when your account gets
locked. Many try to reset their password and are still faced with a lockout.
With this change, users receive an email that allows them to unlock their
account immediately. The previous behavior where the account is auto-unlocked
after a time also still works.

See merge request !2049
2015-12-21 17:53:20 +00:00
Douwe Maan 9832e60ffb Merge branch 'tduehr/gitlab-ce-cas-support' 2015-12-21 17:38:37 +01:00