Commit Graph
22091 Commits
Author SHA1 Message Date
Yorick Peterse ab08321be8 Merge branch 'update-allocations-gem' into 'master'
See merge request !2262
2015-12-31 14:46:07 +00:00
Yorick Peterse 8e983d33d7 Merge branch 'reduce-influxdb-tags' into 'master'
See merge request !2252
2015-12-31 14:45:20 +00:00
Yorick Peterse 6d5202e2b6 Updated allocations Gem to version 1.0.3 2015-12-31 12:27:23 +01:00
Yorick Peterse c936e4e3c8 Removed various default metrics tags
While it's useful to keep track of the different versions (Ruby, GitLab,
etc) doing so for every point wastes disk space and possibly also RAM
(which InfluxDB is all to eager to gobble up). If we want to see the
performance differences between different GitLab versions simply looking
at the performance since the last release date should suffice.
2015-12-31 11:26:04 +01:00
Robert Speicher 7945cf4163 Merge branch 'zj/gitlab-ce-swap-position-author-assignee-selector-issueable' into 'master'
Swap Author and Assignee Selectors on issuable index view

Closes #4039

See merge request !2256
2015-12-30 23:23:24 +00:00
Robert Speicher 00dc5f1b3e Update CHANGELOG
[ci skip]
2015-12-30 18:22:59 -05:00
Robert Speicher efc679e4aa Fix "I see current user as the first user" step
Why did this break? `¯\_(ツ)_/¯`
2015-12-30 18:22:59 -05:00
Zeger-Jan van de WegandRobert Speicher 1be406d741 Swap Author and Assignee Selectors on issuable index view
Closes #4039
2015-12-30 18:21:53 -05:00
Robert Speicher 586ac6460b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-12-30 16:57:47 -05: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
Robert Speicher 5c6b9e8c57 Update CHANGELOG
[ci skip]
2015-12-30 16:51:47 -05:00
Robert Speicher 4ed369558e Merge branch 'fix-build' into 'master'
Ensure that is no pending migrations when using database on
Gitlab::CurrentSettings

This fixes the undefined method `recaptcha_enabled' for
#<ApplicationSetting:0x007f28552f8238> when running the build.

See merge request !2254
2015-12-30 20:18:30 +00:00
Sytse Sijbrandij 088d833c0a Merge branch 'feature/env_variables_for_emails' into 'master'
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
2015-12-30 16:31:11 +00:00
Douglas Barbosa Alexandre ff98c631c1 Make sure that is no pending migrations in Gitlab::CurrentSettings 2015-12-30 14:26:54 -02: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
Grzegorz Bizon 333d3d9e5d Merge branch 'fix/missing-ci-build-traces' into 'master'
Hotfix for builds trace data integrity

Closes #4246

See merge request !2224
2015-12-30 06:54:27 +00:00
Robert Speicher e70ffdbf29 Merge branch 'fix-user-autocomplete' into 'master'
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
2015-12-30 01:32:35 +00:00
Robert Speicher 961e38ac92 Merge branch 'fix-transfer-project-email' into 'master'
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
2015-12-29 22:14:36 +00:00
Stan Hu 59533d47dd 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
2015-12-29 13:49:44 -08:00
Robert Speicher a80f2b792c Update CHANGELOG
[ci skip]
2015-12-29 16:29:45 -05:00
Valery Sizov eeba266e3d Merge branch 'upvote_count_to_api' into 'master'
Revert upvotes and downvotes params back to MR API

issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672

See merge request !2212
2015-12-29 16:07:12 +00:00
Yorick Peterse a12517466b Merge branch 'influxdb-current-settings' into 'master'
See merge request !2239
2015-12-29 16:03:13 +00:00
Yorick Peterse 701e5de910 Use Gitlab::CurrentSettings for InfluxDB
This ensures we can still start up even when not connecting to a
database.
2015-12-29 15:49:12 +01:00
Yorick Peterse 1dbf7284a9 Merge branch 'influxdb-without-sidekiq' into 'master'
See merge request !2238
2015-12-29 14:40:51 +00:00
Yorick Peterse 620e7bb3d6 Write to InfluxDB directly via UDP
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.
2015-12-29 14:53:45 +01:00
Yorick Peterse 03478e6d5b Strip newlines from obfuscated SQL
Newlines aren't really needed and they may mess with InfluxDB's line
protocol.
2015-12-29 13:40:08 +01:00
Dmitriy Zaporozhets 10491c38b0 Merge branch 'issue_3780' into 'master'
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
2015-12-29 11:54:13 +00:00
Dmitriy Zaporozhets 58bc4b72d5 Merge branch 'feature/recaptcha_settings' into 'master'
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
2015-12-29 09:39:54 +00:00
Grzegorz Bizon 504696453b Add hotfix that allows to access build artifacts created before 8.3
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).
2015-12-29 09:51:19 +01:00
Valery Sizov d3807328d8 note votes methids implementation 2015-12-29 10:11:20 +02:00
Stan Hu e619d0b615 When reCAPTCHA is disabled, allow registrations to go through without a code 2015-12-28 16:59:59 -08:00
Robert Speicher f0ecd69be5 Merge branch 'fix-spelling-mistake' into 'master'
Fix spelling mistake, thanks Connor.

[ci skip]

See merge request !2227
2015-12-29 00:13:16 +00:00
Stefan KahlhöferandRubén Dávila 41c74cec09 Downcased user or email search for avatar_icon.
Signed-off-by: Rubén Dávila <rdavila84@gmail.com>
2015-12-28 18:13:50 -05:00
Yorick Peterse 3a227b5abb Merge branch 'influxdb-missing-settings' into 'master'
Handle missing settings table for metrics



See merge request !2232
2015-12-28 21:58:49 +00:00
Achilleas Pipinellis 03451a252f Merge branch 'fix_link_permissions' into 'master'
Fix broken link in permissions page



See merge request !2233
2015-12-28 21:55:53 +00:00
Yorick Peterse ed214a11ca Handle missing settings table for metrics
This ensures we can still boot, even when the "application_settings"
table doesn't exist.
2015-12-28 22:38:34 +01:00
Achilleas Pipinellis c5c6a945f2 Fix broken link in permissions page [ci skip] 2015-12-28 23:06:58 +02: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 47fbba4474 Merge branch 'fix-gitlab-yml-syntax' into 'master'
Fixed syntax in gitlab.yml.example



See merge request !2230
2015-12-28 19:34:11 +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
Sytse Sijbrandij 4465e2eca0 Fix spelling mistake, thanks Connor. 2015-12-28 17:08:15 +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
Grzegorz Bizon 42592201d9 Hotfix for builds trace data integrity
Issue #4246
2015-12-28 15:28:39 +01:00
Sytse Sijbrandij 29fe466a4d Merge branch 'issue-weight-contributing' into 'master'
add issue weight to contributing

cc @dzaporozhets 

See merge request !2223
2015-12-28 14:08:51 +00: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
Job van der Voort c68f8533aa add issue weight to contributing 2015-12-28 14:02:18 +01:00