summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'diff-parse-first-commit' into 'master'Robert Speicher2016-01-141-2/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Properly generate diff of orphan commits, like the first commit in a repository Fixes gitlab-org/gitlab_git#14 See merge request !2427
| * | Properly generate diff of orphan commits, like the first commit in a repositoryDouwe Maan2016-01-141-2/+3
| | |
* | | Merge branch 'backport-ee' into 'master' Robert Speicher2016-01-142-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport two commits from EE Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/110 See merge request !2424
| * | | Prevent circular reference error in BanzaiDouwe Maan2016-01-142-4/+0
| | | |
* | | | Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatterDouglas Barbosa Alexandre2016-01-141-1/+1
| | | |
* | | | Refactoring Gitlab::GithubImport::ImporterDouglas Barbosa Alexandre2016-01-141-7/+13
| | | |
* | | | Import GitHub wiki into GitLabDouglas Barbosa Alexandre2016-01-143-1/+34
| | | |
* | | | Minor improvements in build arfifacts browserci/view-build-artifactsGrzegorz Bizon2016-01-142-7/+14
| | | | | | | | | | | | | | | | | | | | Added also a `Gitlab::Ci::Build::Artifacts::Metadata::ParserError` exception class.
* | | | Use Hash to store paths and entries metadata in artifacts browserGrzegorz Bizon2016-01-142-18/+11
| | | |
* | | | Improve readability of artifacts `Metadata` related codeGrzegorz Bizon2016-01-142-34/+24
| | | |
* | | | Improve readability of artifacts browser `Entry` related codeGrzegorz Bizon2016-01-142-25/+27
| | | |
* | | | Simplify encoding related implementation in artifacts metadataGrzegorz Bizon2016-01-141-6/+5
| | | |
* | | | Make encoding of paths returned by metadata consistent (UTF-8)Grzegorz Bizon2016-01-141-3/+3
| | | |
* | | | Improvements, readability for artifacts browserGrzegorz Bizon2016-01-141-5/+7
| | | |
* | | | Support only valid UTF-8 paths in build artifacts browserGrzegorz Bizon2016-01-142-5/+13
| | | |
* | | | Improve invalid build artifacts metadata path matcherGrzegorz Bizon2016-01-141-5/+2
| | | |
* | | | Render only valid paths in artifacts metadataGrzegorz Bizon2016-01-142-7/+15
| | | | | | | | | | | | | | | | | | | | In this version we will support only relative paths in artifacts metadata. Support for absolute paths will be introduced later.
* | | | Simplify implementation of build artifacts browser (refactoring)Grzegorz Bizon2016-01-143-174/+153
| | | |
* | | | Change format of artifacts metadata from text to binary 0.0.1Grzegorz Bizon2016-01-141-10/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the format of metadata to handle paths, that may contain whitespace characters, new line characters and non-UTF-8 characters. Now those paths along with metadata in JSON format are stored as length-prefixed strings (uint32 prefix). Metadata file has a custom format: 1. First string field is metadata version field (string) 2. Second string field is metadata errors field (JSON strong) 3. All subsequent fields is pair of path (string) and path metadata in JSON format. Path's metadata contains all fields that where possible to extract from ZIP archive like date of modification, CRC, compressed size, uncompressed size and comment.
* | | | Show file size in artifacts browser using metadataGrzegorz Bizon2016-01-142-9/+8
| | | |
* | | | Add method that checks if path exists in `StringPath`Grzegorz Bizon2016-01-141-0/+4
| | | |
* | | | Render 404 when artifacts path is invalidGrzegorz Bizon2016-01-141-1/+1
| | | |
* | | | Do not depend on universe when checking parent in `StringPath`Grzegorz Bizon2016-01-141-3/+12
| | | |
* | | | Extract artifacts metadata implementation to separate classGrzegorz Bizon2016-01-142-2/+59
| | | |
* | | | Improve path sanitization in `StringPath`Grzegorz Bizon2016-01-141-9/+8
| | | |
* | | | Add path sanitization to `StringPath`Grzegorz Bizon2016-01-141-12/+27
| | | | | | | | | | | | | | | | [ci skip]
* | | | Parse artifacts metadata stored in JSON formatGrzegorz Bizon2016-01-141-3/+9
| | | |
* | | | Use metadata stored in artifacats metadata fileGrzegorz Bizon2016-01-141-1/+1
| | | |
* | | | Use short method call in StringPath instead blockGrzegorz Bizon2016-01-141-2/+2
| | | |
* | | | Improve performance of `StringPath`Grzegorz Bizon2016-01-141-4/+11
| | | |
* | | | Add support for parent directories in `StringPath`Grzegorz Bizon2016-01-141-1/+9
| | | | | | | | | | | | | | | | | | | | This support is not completed though, as parent directory that is first in collection returned by `directories!` is not iterable yet.
* | | | Add support for root path for `StringPath`Grzegorz Bizon2016-01-141-8/+18
| | | |
* | | | Add implementation of remaining methods in `StringPath`Grzegorz Bizon2016-01-141-2/+14
| | | |
* | | | Add `parent` iteration implementation to `StringPath`Grzegorz Bizon2016-01-141-2/+9
| | | |
* | | | Use `Gitlab::StringPath` in CI build artifacts controllerGrzegorz Bizon2016-01-141-0/+12
| | | |
* | | | Add new methods to StringPathGrzegorz Bizon2016-01-141-2/+17
| | | |
* | | | Add implementation of StringPath classGrzegorz Bizon2016-01-141-0/+35
| |/ / |/| | | | | | | | | | | | | | | | | `StringPath` class is something similar to Ruby's `Pathname` class, but does not involve any IO operations. `StringPath` objects require passing string representation of path, and array of paths that represents universe to constructor to be intantiated.
* | | Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-141-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP Sync blocked user edgecases Allow GitLab admins to block otherwise valid GitLab LDAP users (https://gitlab.com/gitlab-org/gitlab-ce/issues/3462) Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other. Expected behavior: - [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?` - [x] "ldap_blocked" users can't be unblocked by the Admin UI - [x] "ldap_blocked" users can't be unblocked by the API - [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked" - [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization - [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked` Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users: ![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png) There will be another MR for the EE version. See merge request !2242
| * | fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecasesGabriel Mazetto2016-01-141-3/+1
| | |
| * | Code style fixes and some code simplifiedGabriel Mazetto2016-01-081-1/+3
| | |
| * | LDAP synchronization block/unblock new statesGabriel Mazetto2016-01-081-3/+3
| | |
* | | Merge branch 'configure-randomize-metrics-sample-interval' into 'master' Yorick Peterse2016-01-132-5/+28
|\ \ \ | | | | | | | | See merge request !2406
| * | | Randomize metrics sample intervalsconfigure-randomize-metrics-sample-intervalYorick Peterse2016-01-131-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sampling data at a fixed interval means we can potentially miss data from events occurring between sampling intervals. For example, say we sample data every 15 seconds but Unicorn workers get killed after 10 seconds. In this particular case it's possible to miss interesting data as the sampler will never get to actually submitting data. To work around this (at least for the most part) the sampling interval is randomized as following: 1. Take the user specified sampling interval (15 seconds by default) 2. Divide it by 2 (referred to as "half" below) 3. Generate a range (using a step of 0.1) from -"half" to "half" 4. Every time the sampler goes to sleep we'll grab the user provided interval and add a randomly chosen "adjustment" to it while making sure we don't pick the same value twice in a row. For a specified timeout of 15 this means the actual intervals can be anywhere between 7.5 and 22.5, but never can the same interval be used twice in a row. The rationale behind this change is that on dev.gitlab.org I'm sometimes seeing certain Gitlab::Git/Rugged objects being retained, but only for a few minutes every 24 hours. Knowing the code of Gitlab and how much memory it uses/leaks I suspect we're missing data due to workers getting terminated before the sampler can write its data to InfluxDB.
| * | | Make the metrics sampler interval configurableYorick Peterse2016-01-132-2/+3
| | | |
* | | | Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' Douwe Maan2016-01-131-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | 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
View Lorry Controller Status