summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'feature/env_variables_for_emails' into 'master' jenkins-integration-fixSytse Sijbrandij2015-12-303-6/+9
|\ | | | | | | | | | | | | | | | | | | | | Added additional config environmental variables to help Debian packaging * GITLAB_EMAIL_FROM * GITLAB_EMAIL_DISPLAY_NAME * GITLAB_EMAIL_REPLY_TO This is a followup on https://gitlab.com/gitlab-org/gitlab-ce/issues/3717 See merge request !2251
| * Added additional config environmental variables to help Debian packagingGabriel Mazetto2015-12-303-6/+9
|/ | | | | * GITLAB_EMAIL_FROM * GITLAB_EMAIL_DISPLAY_NAME * GITLAB_EMAIL_REPLY_TO
* Merge branch 'fix/missing-ci-build-traces' into 'master' Grzegorz Bizon2015-12-302-9/+57
|\ | | | | | | | | | | | | Hotfix for builds trace data integrity Closes #4246 See merge request !2224
| * Add hotfix that allows to access build artifacts created before 8.3fix/missing-ci-build-tracesGrzegorz Bizon2015-12-292-9/+36
| | | | | | | | | | | | | | | | | | | | | | This is a temporary hotfix that allows to access build artifacts created before 8.3. See #5257. This needs to be changed after migrating CI build files. Note that `ArtifactUploader` uses `artifacts_path` to create a storage directory before and after parsisting `Ci::Build` instance, before and after moving a file to store (save and fetch a file).
| * Hotfix for builds trace data integrityGrzegorz Bizon2015-12-281-1/+22
| | | | | | | | Issue #4246
* | Merge branch 'fix-user-autocomplete' into 'master' Robert Speicher2015-12-301-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes problem with user autocomplete URI ``` Failed to load resource: net::ERR_NAME_NOT_RESOLVED http://autocomplete/users.json?search=&per_page=20&active=true&current_user=false ``` Fixes #4118, #4136 See merge request !2136
| * | Fix user autocomplete uriIgor Matsko2015-12-261-1/+1
| | |
* | | Merge branch 'fix-transfer-project-email' into 'master' Robert Speicher2015-12-292-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project transfer e-mail sending incorrect paths in e-mail notification The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race condition where the mailer would be invoked before the project was committed to the database, causing the transfer e-mail notification to show the old path instead of the new one. Closes #4670 See merge request !2235
| * | | Fix project transfer e-mail sending incorrect paths in e-mail notificationStan Hu2015-12-292-1/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | The introduction of ActiveJob and `deliver_now` in 7f214cee7 caused a race condition where the mailer would be invoked before the project was committed to the database, causing the transfer e-mail notification to show the old path instead of the new one. Closes #4670
* | | Update CHANGELOGRobert Speicher2015-12-291-4/+4
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'upvote_count_to_api' into 'master' Valery Sizov2015-12-296-23/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert upvotes and downvotes params back to MR API issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 See merge request !2212
| * | | note votes methids implementationupvote_count_to_apiValery Sizov2015-12-291-2/+2
| | | |
| * | | Revert upvotes and downvotes params to MR APIValery Sizov2015-12-286-21/+22
| | | |
* | | | Merge branch 'influxdb-current-settings' into 'master' Yorick Peterse2015-12-291-25/+11
|\ \ \ \ | | | | | | | | | | See merge request !2239
| * | | | Use Gitlab::CurrentSettings for InfluxDBYorick Peterse2015-12-291-25/+11
|/ / / / | | | | | | | | | | | | | | | | This ensures we can still start up even when not connecting to a database.
* | | | Merge branch 'influxdb-without-sidekiq' into 'master' Yorick Peterse2015-12-2919-155/+155
|\ \ \ \ | | | | | | | | | | See merge request !2238
| * | | | Write to InfluxDB directly via UDPYorick Peterse2015-12-2918-155/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for Sidekiq and any overhead/problems introduced by TCP. There are a few things to take into account: 1. When writing data to InfluxDB you may still get an error if the server becomes unavailable during the write. Because of this we're catching all exceptions and just ignore them (for now). 2. Writing via UDP apparently requires the timestamp to be in nanoseconds. Without this data either isn't written properly. 3. Due to the restrictions on UDP buffer sizes we're writing metrics one by one, instead of writing all of them at once.
| * | | | Strip newlines from obfuscated SQLYorick Peterse2015-12-292-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Newlines aren't really needed and they may mess with InfluxDB's line protocol.
* | | | | Merge branch 'issue_3780' into 'master' Dmitriy Zaporozhets2015-12-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downcased user or email search for avatar_icon. GitLab users are defined with their mail address which is enforced to be lower case. When a commit is listed in the history whose committer mail address is not written in all lower case, the corresponding GitLab user won't be found because the search is case sensitive resp. the mail address to search for not downcased. Closes #3780 See merge request !2234
| * | | | Downcased user or email search for avatar_icon.issue_3780Stefan Kahlhöfer2015-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rubén Dávila <rdavila84@gmail.com>
* | | | | Merge branch 'feature/recaptcha_settings' into 'master' Dmitriy Zaporozhets2015-12-2913-71/+84
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes reCAPTCHA configurable through Application Settings screen Following the work made by @stanhu here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2216, made it configurable without needing to restart Gitlab See merge request !2231
| * | | | | When reCAPTCHA is disabled, allow registrations to go through without a codefeature/recaptcha_settingsStan Hu2015-12-281-1/+1
| | | | | |
| * | | | | reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-2813-71/+84
| | | | | |
* | | | | | Merge branch 'fix-spelling-mistake' into 'master' Robert Speicher2015-12-292-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spelling mistake, thanks Connor. [ci skip] See merge request !2227
| * | | | | Fix spelling mistake, thanks Connor.fix-spelling-mistakeSytse Sijbrandij2015-12-282-4/+4
| | | | | |
* | | | | | Merge branch 'influxdb-missing-settings' into 'master' Yorick Peterse2015-12-282-7/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle missing settings table for metrics See merge request !2232
| * | | | | | Handle missing settings table for metricsYorick Peterse2015-12-282-7/+11
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | This ensures we can still boot, even when the "application_settings" table doesn't exist.
* | | | | | Merge branch 'fix_link_permissions' into 'master' Achilleas Pipinellis2015-12-281-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken link in permissions page See merge request !2233
| * | | | | Fix broken link in permissions page [ci skip]Achilleas Pipinellis2015-12-281-3/+3
| | | | | |
* | | | | | Merge branch 'relocate-influxdb-settings' into 'master' Yorick Peterse2015-12-287-33/+122
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move InfluxDB settings to ApplicationSetting This moves the settings from the YAML files to the database. cc @sytses See merge request !2228
| * | | | | | Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settingsYorick Peterse2015-12-287-33/+122
| | | | | | |
* | | | | | | Merge branch 'fix-gitlab-yml-syntax' into 'master' Yorick Peterse2015-12-281-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed syntax in gitlab.yml.example See merge request !2230
| * | | | | | Fixed syntax in gitlab.yml.exampleYorick Peterse2015-12-281-1/+1
|/ / / / / /
* | | | | | Merge branch 'restart-settings-are-moved-too' into 'master' Dmitriy Zaporozhets2015-12-281-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restart settings are moved too. See merge request !2226
| * | | | | | Restart settings are moved too.Sytse Sijbrandij2015-12-281-2/+2
| | | | | | |
* | | | | | | Merge branch 'issue-weight-contributing' into 'master' Sytse Sijbrandij2015-12-281-0/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add issue weight to contributing cc @dzaporozhets See merge request !2223
| * | | | | | add issue weight to contributingissue-weight-contributingJob van der Voort2015-12-281-0/+22
| | | | | | |
* | | | | | | Merge branch 'influxdb' into 'master' Dmitriy Zaporozhets2015-12-2831-12/+1693
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Added host option for InfluxDBinfluxdbYorick Peterse2015-12-282-1/+3
| | | | | | | |
| * | | | | | | Fixed styling of MetricsWorker specsYorick Peterse2015-12-281-1/+1
| | | | | | | |
| * | | | | | | Use String#delete for removing double quotesYorick Peterse2015-12-281-1/+1
| | | | | | | |
| * | | | | | | Track object counts using the "allocations" GemYorick Peterse2015-12-175-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to track the counts of actual classes instead of "T_XXX" nodes. This is only enabled on CRuby as it uses CRuby specific APIs.
| * | | | | | | Instrument all ActiveRecord model methodsYorick Peterse2015-12-173-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Support for instrumenting class hierarchiesYorick Peterse2015-12-172-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used to (for example) instrument all ActiveRecord models.
| * | | | | | | Only track method calls above a certain thresholdYorick Peterse2015-12-174-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Allow filtering of what methods to instrumentYorick Peterse2015-12-172-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to determine if a method should be instrumented or not using a block.
| * | | | | | | Drop empty tag values from metricsYorick Peterse2015-12-172-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InfluxDB throws an error when trying to store a list of tags where one or more have an empty value.
| * | | | | | | Cast values to strings before escaping themYorick Peterse2015-12-172-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that e.g. line numbers used in tags are first casted to strings.
| * | | | | | | Track location information as tagsYorick Peterse2015-12-174-16/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the information to be displayed when using certain functions (e.g. top()) as well as making it easier to aggregate on a per file basis.
| * | | | | | | Added specs for MetricsWorkerYorick Peterse2015-12-171-0/+40
| | | | | | | |
View Lorry Controller Status