summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' Douwe Maan2016-01-132-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL; https://github.com/gitlabhq/gitlabhq/pull/9964 @DouweM See merge request !2383
| | * | | | | | | | | | Use CGI.escape instead of URI.escape, because URI is obsoleted.Jason Lee2016-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ref: https://github.com/ruby/ruby/commit/238b979f1789f95262a267d8df6239806f2859cc
| | * | | | | | | | | | Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some ↵Jason Lee2016-01-121-2/+2
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | complex URL;
| * | | | | | | | | | Merge branch 'ci/api-projects' into 'master' Douwe Maan2016-01-132-6/+12
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend projects API with CI data Reference #4264 See merge request !2303
| | * | | | | | | | | | Modify CI features in projects APIci/api-projectsTomasz Maczukin2016-01-113-31/+16
| | | | | | | | | | | |
| | * | | | | | | | | | Update ./doc/apiTomasz Maczukin2016-01-071-0/+9
| | | | | | | | | | | |
| | * | | | | | | | | | Add ci fields in project create/update feature APITomasz Maczukin2016-01-052-4/+13
| | | | | | | | | | | |
| | * | | | | | | | | | Add CI data to projcet entityTomasz Maczukin2016-01-051-0/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Disable colorization if STDOUT is not a ttyRobert Speicher2016-01-121-0/+2
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'remove-application-frames-from-views' into 'master' Yorick Peterse2016-01-122-23/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | See merge request !2392
| | * | | | | | | | | | Stop tracking call stacks for instrumented viewsremove-application-frames-from-viewsYorick Peterse2016-01-122-23/+1
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Where a vew is called from doesn't matter as much. We already know what action they belong to and this is more than enough information. By removing the file/line number from the list of tags we should also be able to reduce the number of series stored in InfluxDB.
| * | | | | | | | | | Track memory allocated during a transactionYorick Peterse2016-01-121-3/+12
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gives a very rough estimate of how much memory is allocated during a transaction. This only works reliably when using a single-threaded application server and a Ruby implementation with a GIL as otherwise memory allocated by other threads might skew the statistics. Sadly there's no way around this as Ruby doesn't provide a reliable way of gathering accurate object sizes upon allocation on a per-thread basis.
| * | | | | | | | | Merge branch 'optimize_ldap' into 'master' Douwe Maan2016-01-113-11/+25
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize LDAP and add a search timeout Related to #4282 This merge request arranges some things in `access.rb` to facilitate some optimizations in EE (to come later). It also adds a 10 second timeout to all LDAP searches so the entire worker is not blocked if some query doesn't return in a reasonable amount of time. This timeout is configurable per LDAP server. See merge request !2267
| | * | | | | | | | | Optimize LDAP and add a search timeoutDrew Blessing2016-01-113-11/+25
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Tag all transaction metrics with an "action" tagYorick Peterse2016-01-113-12/+18
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this it's impossible to find out what methods/views/queries are executed by a certain controller or Sidekiq worker. While this will increase the total number of series it should stay within reasonable limits due to the amount of "actions" being small enough.
| * | | | | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-114-9/+15
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'api-project-upload' into 'master' Robert Speicher2016-01-083-9/+14
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API project upload endpoint Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317 See merge request !2329
| | | * | | | | | | DRY up upload and download servicesapi-project-uploadDouwe Maan2016-01-081-1/+1
| | | | | | | | | |
| | | * | | | | | | Satisfy RubocpDouwe Maan2016-01-071-1/+1
| | | | | | | | | |
| | | * | | | | | | Add API project upload endpointDouwe Maan2016-01-073-9/+14
| | | | | | | | | |
| | * | | | | | | | Merge branch 'suppress-allow-failure-builds' into 'master' Stan Hu2016-01-081-0/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress e-mails on failed builds if allow_failure is set Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about the benchmarks and others that have `allow_failure` set to `true`. @ayufan mentioned creating a summary e-mail to prevent getting one e-mail per build, but the latter might actually be desirable. For example, I do want to know if Rubocop errors fail right away. See merge request !2178
| | | * | | | | | | | Suppress e-mails on failed builds if allow_failure is setStan Hu2016-01-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about benchmarks and other specs that have `allow_failure` set to `true`.
| * | | | | | | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-082-0/+24
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'current-settings-handle-missing-db' into 'master' Yorick Peterse2016-01-081-0/+3
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | See merge request !2346
| | | * | | | | | | | | Handle missing DBs in connect_to_db?Yorick Peterse2016-01-081-0/+3
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures CurrentSettings#connect_to_db? returns "false" in the event of a database not existing, instead of raising an error.
| | * | | | | | | | | Delete tag via APIapi-delete-tagRobert Schilling2016-01-081-0/+21
| | | | | | | | | | |
| * | | | | | | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-087-27/+61
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'task-list-class' into 'master' Robert Speicher2016-01-071-4/+9
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly set task-list class on single item task lists Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4193 See merge request !2330
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' into task-list-classtask-list-classDouwe Maan2016-01-073-6/+8
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | * | | | | | | | | Properly set task-list class on single item task listsDouwe Maan2016-01-071-4/+9
| | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'milestone-ref' into 'master' Robert Speicher2016-01-074-18/+45
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to milestone in "Milestone changed" system note Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4141 See merge request !2203
| | | * | | | | | | | Merge branch 'master' into milestone-refDouwe Maan2016-01-062-2/+2
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Remove icon from milestone reference.Douwe Maan2016-01-051-2/+0
| | | | | | | | | | | |
| | | * | | | | | | | | Merge branch 'master' into milestone-refDouwe Maan2016-01-0525-31/+787
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | * | | | | | | | | Merge branch 'master' into milestone-refDouwe Maan2015-12-254-9/+15
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into milestone-refDouwe Maan2015-12-244-5/+14
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | More escaping!Douwe Maan2015-12-242-5/+5
| | | | | | | | | | | | |
| | | * | | | | | | | | | Render milestone links as referencesDouwe Maan2015-12-244-18/+47
| | | | | | | | | | | | |
| | | * | | | | | | | | | Escape reference link textDouwe Maan2015-12-242-8/+11
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'remove-more-influxdb-tags' into 'master' Yorick Peterse2016-01-072-5/+7
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | See merge request !2328
| | | * | | | | | | | | | | Store request methods/URIs as valuesYorick Peterse2016-01-072-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since filtering by these values is very rare (they're mostly just displayed as-is) we don't need to waste any index space by saving them as tags. By storing them as values we also greatly reduce the number of series in InfluxDB.
| | | * | | | | | | | | | | Removed UUIDs from metrics transactionsYorick Peterse2016-01-071-3/+1
| | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While useful for finding out what methods/views belong to a transaction this might result in too much data being stored in InfluxDB.
| * | | | | | | | | | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-075-21/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge branch 'use-sudo-with-incorrect-base-permissions' into 'master' Dmitriy Zaporozhets2016-01-071-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggest prefacing find command with sudo when base permissions are wrong Closes #5872 See merge request !2299
| | | * | | | | | | | | | Suggest prefacing find command with sudo when base permissions are wrongStan Hu2016-01-051-1/+1
| | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #5872
| | * | | | | | | | | | Revert "Store SQL/view timings in milliseconds"Yorick Peterse2016-01-072-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7549102bb727daecc51da84af39956b32fc41537. Apparently I was wrong about ActiveSupport::Notifications::Event#duration returning the duration in seconds, instead it returns it in milliseconds already.
| | * | | | | | | | | | Merge branch 'remove-influxdb-credentials' into 'master' Yorick Peterse2016-01-071-5/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | See merge request !2319
| | | * | | | | | | | | | Remove InfluxDB username/passwordremove-influxdb-credentialsYorick Peterse2016-01-061-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InfluxDB over UDP doesn't use authentication, thus there's no need for these settings.
| | * | | | | | | | | | | Merge branch 'merge-when-build-succeeds-unchecked' into 'master' Robert Speicher2016-01-061-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running The Merge when build succeeds service only merges when the MR is mergeable (open, not WIP, no conflicts). When the target branch is updated, all affected MRs have their merge status set to `unchecked`, and the conflicts check will only happen when `check_if_can_be_merged` is called, which happens when the MR page is viewed. When someone enables the automatic merge, the target branch is updated, no-one views the MR page again, and the build succeeds, the mergeability check will fail and the MR will not in fact be merged. This MR makes sure `check_if_can_be_merged` is always called when MR mergeability is checked. See merge request !2304
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-uncheckedDouwe Maan2016-01-062-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / | | | | |/| | | | | | | | |
View Lorry Controller Status