summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't log backtrace in Asana servicemikew1/gitlab-ce-better-asana-refsMike Wyatt2016-01-041-1/+0
* Merge remote-tracking branch 'upstream/master' into better-asana-refsMike Wyatt2015-12-31403-2136/+22333
|\
| * Update CHANGELOGRobert Speicher2015-12-311-2/+2
| * Merge branch 'spinach_random_fix' into 'master' Valery Sizov2015-12-311-1/+1
| |\
| | * spinach fixValery Sizov2015-12-311-1/+1
| * | Merge branch 'update-allocations-gem' into 'master' Yorick Peterse2015-12-311-1/+1
| |\ \
| | * | Updated allocations Gem to version 1.0.3update-allocations-gemYorick Peterse2015-12-311-1/+1
| | |/
| * | Merge branch 'reduce-influxdb-tags' into 'master' Yorick Peterse2015-12-312-8/+2
| |\ \ | | |/ | |/|
| | * Removed various default metrics tagsreduce-influxdb-tagsYorick Peterse2015-12-312-8/+2
| |/
| * Merge branch 'zj/gitlab-ce-swap-position-author-assignee-selector-issueable' ...Robert Speicher2015-12-303-9/+9
| |\
| | * Update CHANGELOGRobert Speicher2015-12-301-1/+0
| | * Fix "I see current user as the first user" stepRobert Speicher2015-12-301-5/+4
| | * Swap Author and Assignee Selectors on issuable index viewZeger-Jan van de Weg2015-12-302-4/+6
| |/
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRobert Speicher2015-12-301-8/+0
| |\
| | * Merge branch 'remove-whenever-schedule' into 'master' Robert Speicher2015-12-301-8/+0
| | |\
| | | * We don't use whenever anymore. Lets remove the schedule fileJeroen van Baarsen2015-12-301-8/+0
| * | | Update CHANGELOGRobert Speicher2015-12-301-1/+1
| |/ /
| * | Merge branch 'fix-build' into 'master' Robert Speicher2015-12-301-1/+3
| |\ \
| | * | Make sure that is no pending migrations in Gitlab::CurrentSettingsfix-buildDouglas Barbosa Alexandre2015-12-301-1/+3
| | |/
| * | 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 packagingGabriel Mazetto2015-12-303-6/+9
| |/
| * Merge branch 'fix/missing-ci-build-traces' into 'master' Grzegorz Bizon2015-12-302-9/+57
| |\
| | * Add hotfix that allows to access build artifacts created before 8.3fix/missing-ci-build-tracesGrzegorz Bizon2015-12-292-9/+36
| | * Hotfix for builds trace data integrityGrzegorz Bizon2015-12-281-1/+22
| * | Merge branch 'fix-user-autocomplete' into 'master' Robert Speicher2015-12-301-1/+1
| |\ \
| | * | 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 notificationStan Hu2015-12-292-1/+6
| |/ / /
| * | | Update CHANGELOGRobert Speicher2015-12-291-4/+4
| * | | Merge branch 'upvote_count_to_api' into 'master' Valery Sizov2015-12-296-23/+24
| |\ \ \
| | * | | 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
| |\ \ \ \
| | * | | | Use Gitlab::CurrentSettings for InfluxDBYorick Peterse2015-12-291-25/+11
| |/ / / /
| * | | | Merge branch 'influxdb-without-sidekiq' into 'master' Yorick Peterse2015-12-2919-155/+155
| |\ \ \ \
| | * | | | Write to InfluxDB directly via UDPYorick Peterse2015-12-2918-155/+149
| | * | | | Strip newlines from obfuscated SQLYorick Peterse2015-12-292-1/+7
| * | | | | Merge branch 'issue_3780' into 'master' Dmitriy Zaporozhets2015-12-291-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Downcased user or email search for avatar_icon.issue_3780Stefan Kahlhöfer2015-12-281-1/+1
| * | | | | Merge branch 'feature/recaptcha_settings' into 'master' Dmitriy Zaporozhets2015-12-2913-71/+84
| |\ \ \ \ \
| | * | | | | 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.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 metricsYorick Peterse2015-12-282-7/+11
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'fix_link_permissions' into 'master' Achilleas Pipinellis2015-12-281-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | 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 ApplicationSettingrelocate-influxdb-settingsYorick Peterse2015-12-287-33/+122