Commit Graph
1402 Commits
Author SHA1 Message Date
Grzegorz Bizon 61fb47a432 Simplify implementation of build artifacts browser (refactoring) 2016-01-14 12:48:15 +01:00
Grzegorz Bizon bd4899befe Disable :format in artifacts browser path 2016-01-14 12:48:13 +01:00
Grzegorz Bizon f091272f19 Move artifacts controller level up
This reverts nesting artifacts controller in builds module.
2016-01-14 12:48:12 +01:00
Grzegorz Bizon a96d45c694 Add view action to artifacts controller 2016-01-14 12:48:12 +01:00
Grzegorz Bizon 79fe18d9e7 Move build artifacts implementation to separate controller 2016-01-14 12:48:12 +01:00
Robert Speicher 00e8700433 Broadcast Messages can now be edited
Closes #3046
2016-01-13 11:42:15 -05: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
Jeroen Nijhof e0436005af Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-08 17:25:09 +01:00
Drew Blessing c1e974ed88 Merge branch 'issue_3076' into 'master'
Fix problem with projects ending with .keys #3076

Closes #3076

Move route `:username.keys` below project's routes. This allow project's to handle names ending with `.keys`

See merge request !1883
2016-01-08 15:52:05 +00:00
Jeroen Nijhof 2c37ae2f0a Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-08 13:22:30 +01:00
Robert Speicher fa36749bce Add two custom Date/Time conversion formats 2016-01-07 20:01:08 -05:00
Jeroen Nijhof 1695063d15 Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-07 13:58:19 +01:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Jose Corcuera 0b2fa3bfa4 Fix problem with projects ending with .keys #3076 2016-01-06 09:54:43 -05:00
Jeroen Nijhof 9b28220f88 Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-06 14:55:44 +01: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
Robert Speicher a0b3654e2e Merge branch 'remove-whenever-schedule' into 'master'
Remove unused config/schedule.rb file

[ci skip]

See merge request !2249
2015-12-30 21:56:07 +00: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
Jeroen van Baarsen a6fd7b74ee We don't use whenever anymore. Lets remove the schedule file
**Why is this needed?**

Not really needed, but having code that is not used around is confusing, so lets
remove it

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-12-30 13:42:57 +01:00
Gabriel Mazetto a3469d914a reCAPTCHA is configurable through Admin Settings, no reload needed. 2015-12-28 18:50:29 -02:00
Yorick Peterse af00558d38 Merge branch 'relocate-influxdb-settings' into 'master'
Move InfluxDB settings to ApplicationSetting

This moves the settings from the YAML files to the database.

cc @sytses

See merge request !2228
2015-12-28 20:00:57 +00:00
Yorick Peterse 0eab0c6efd Fixed syntax in gitlab.yml.example 2015-12-28 20:28:40 +01:00
Yorick Peterse 4d925f2147 Move InfluxDB settings to ApplicationSetting 2015-12-28 18:00:32 +01:00
Dmitriy Zaporozhets 17ef4cdff9 Merge branch 'restart-settings-are-moved-too' into 'master'
Restart settings are moved too.



See merge request !2226
2015-12-28 15:36:44 +00:00
Sytse Sijbrandij 297f83425e Restart settings are moved too. 2015-12-28 16:33:37 +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
Yorick Peterse 1be5668ae0 Added host option for InfluxDB 2015-12-28 13:14:48 +01:00
Sytse Sijbrandij 61fba0f4cc Thanks Robert for the corrections in the environment variables docs. 2015-12-28 09:37:59 +01: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 fe2f1b4481 Add documentation and example file for environent variables. 2015-12-27 17:36:50 +01:00
Sytse Sijbrandij 4ebd447a05 Use environment variables to configure GitLab. 2015-12-27 17:36:08 +01:00
Gabriel Mazetto 31fb2b7702 Grace period support for TFA 2015-12-24 19:01:30 -02: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 f4c05ee45f Merge branch 'admin_add_identity' into 'master'
Allow admin to create new user identities

Fixes #2442 

See merge request !2077
2015-12-21 17:58:20 +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
Drew Blessing f177aaa5fa Backport JIRA service 2015-12-18 14:19:48 -06:00
Yorick Peterse bcee44ad33 Instrument all ActiveRecord model methods
This works by searching the raw source code for any references to
commonly used ActiveRecord methods. While not bulletproof it saves us
from having to list hundreds of methods by hand. It also ensures that
(most) newly added methods are instrumented automatically.

This _only_ instruments models defined in app/models, should a model
reside somewhere else (e.g. somewhere in lib/) it _won't_ be
instrumented.
2015-12-17 17:25:48 +01:00
Yorick Peterse a41287d898 Only track method calls above a certain threshold
This ensures we don't end up wasting resources by tracking method calls
that only take a few microseconds. By default the threshold is 10
milliseconds but this can be changed using the gitlab.yml configuration
file.
2015-12-17 17:25:48 +01:00
Yorick Peterse 6dc25ad58c Instrument Gitlab::Shel and Gitlab::Git 2015-12-17 17:25:48 +01:00
Yorick Peterse 1b077d2d81 Use custom code for instrumenting method calls
The use of ActiveSupport would slow down instrumented method calls by
about 180x due to:

1. ActiveSupport itself not being the fastest thing on the planet
2. caller_locations() having quite some overhead

The use of caller_locations() has been removed because it's not _that_
useful since we already know the full namespace of receivers and the
names of the called methods.

The use of ActiveSupport has been replaced with some custom code that's
generated using eval() (which can be quite a bit faster than using
define_method).

This new setup results in instrumented methods only being about 35-40x
slower (compared to non instrumented methods).
2015-12-17 17:25:48 +01:00