summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Add API project upload endpointDouwe Maan2016-01-073-9/+14
|
* 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
| |\ \
| * | | Get "Merge when build succeeds" to work when commits were pushed to MR ↵Douwe Maan2016-01-051-1/+1
| | | | | | | | | | | | | | | | target branch while builds were running
* | | | Merge branch 'rs-issue-1697' into 'master' Douwe Maan2016-01-061-0/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define a limited set of filters for SingleLinePipeline Removes the following filters from its parent GfmPipeline: - SyntaxHighlightFilter - UploadLinkFilter - TableOfContentsFilter - LabelReferenceFilter - TaskListFilter Closes #1697 See merge request !2257
| * | | | Define a limited set of filters for SingleLinePipeliners-issue-1697Robert Speicher2016-01-051-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the following filters from its parent GfmPipeline: - SyntaxHighlightFilter - UploadLinkFilter - TableOfContentsFilter - LabelReferenceFilter - TaskListFilter Closes #1697
* | | | | Merge branch 'fix-banzai-cache' into 'master' Robert Speicher2016-01-061-14/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mentionable reference extraction caching. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4130 Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2120 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2283 See merge request !2315
| * | | | Revert "Temporarily disable Markdown caching"Douwe Maan2016-01-061-3/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit d337d5e7137d9b3fd0f9b8890a3ba9296323acc7.
| * | | | Revert "Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue."Douwe Maan2016-01-061-14/+7
| | |_|/ | |/| | | | | | | | | | This reverts commit 4b027bc93a7875c3937f6b90ac1049b4a4d72da5.
* | | | Store SQL/view timings in millisecondsYorick Peterse2016-01-062-3/+11
| | | | | | | | | | | | | | | | | | | | Transaction timings are also already stored in milliseconds, this keeps things consistent.
* | | | Merge branch 'import-gh-pull-requests' into 'master' Douwe Maan2016-01-065-22/+275
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Import GitHub Pull Requests into GitLab Fixes #2833 See merge request !2168
| * | | Ensure that we're only importing local pull requestsDouglas Barbosa Alexandre2016-01-052-1/+9
| | | |
| * | | Generate separate comments when importing GitHub Issues into GitLabDouglas Barbosa Alexandre2016-01-055-72/+114
| | | |
| * | | Refactoring GithubImport::ImporterDouglas Barbosa Alexandre2016-01-053-61/+174
| | | |
| * | | Extract methods to import comments on a GitHub Pull RequestDouglas Barbosa Alexandre2016-01-051-24/+28
| | | |
| * | | Doesn't import GitHub PR where branches were no longer availableDouglas Barbosa Alexandre2016-01-051-38/+44
| | | |
| * | | Import comments on the diff of a GitHub Pull Request into GitLabDouglas Barbosa Alexandre2016-01-051-0/+16
| | | |
| * | | Import comments on GitHub Pull Request into GitLabDouglas Barbosa Alexandre2016-01-051-0/+14
| | | |
| * | | Import GitHub Pull Requests into GitLabDouglas Barbosa Alexandre2016-01-051-7/+57
| | |/ | |/|
* | | Merge branch 'feature/detailed-user-endpoint' of ↵Dmitriy Zaporozhets2016-01-061-1/+1
|\ \ \ | | | | | | | | | | | | https://gitlab.com/Michi302/gitlab-ce
| * | | Make single user API endpoint return Entities::User instead of ↵Michi3022015-12-281-1/+1
| | | | | | | | | | | | | | | | Entities::UserBasic
* | | | Update version check images to use SVGRobert Speicher2016-01-051-1/+1
| |/ / |/| |
* | | Merge branch 'rs-relative-links-to-root' into 'master' Douwe Maan2016-01-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support a single directory traversal in RelativeLinkFilter Prior, if we were viewing a blob at `https://example.com/namespace/project/blob/master/doc/some-file.md` and it contained a relative link such as `[README](../README.md)`, the resulting link when viewing the blob would be: `https://example.com/namespace/project/blob/README.md` which omits the `master` ref, resulting in a 404. Fixes https://gitlab.com/gitlab-org/release-tools/issues/3 See merge request !2247
| * | | Support a single directory traversal in RelativeLinkFilterrs-relative-links-to-rootRobert Speicher2015-12-301-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Prior, if we were viewing a blob at `https://example.com/namespace/project/blob/master/doc/some-file.md` and it contained a relative link such as `[README](../README.md)`, the resulting link when viewing the blob would be: `https://example.com/namespace/project/blob/README.md` which omits the `master` ref, resulting in a 404.
* | | Merge branch 'fix-api-lookup-with-usernames-with-dots' of ↵Dmitriy Zaporozhets2016-01-051-1/+1
|\ \ \ | | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce
| * | | Fix API project lookups when querying with a namespace with dotsStan Hu2016-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to use the /projects/:id API by specifying :id in "namespace/project" format would always result in a 404 if the namespace contained a dot. The reason? From http://guides.rubyonrails.org/routing.html#specifying-constraints: "By default the :id parameter doesn't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within an :id add a constraint which overrides this - for example id: /[^\/]+/ allows anything except a slash." Closes https://github.com/gitlabhq/gitlabhq/issues/9573
* | | | Merge branch 'metrics-tuning' into 'master' Dmitriy Zaporozhets2016-01-058-112/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tuning of metrics data to store This removes data we don't really need, as well as making sure we don't overload any cache stores or databases. See merge request !2265
| * | | | Automatically prefix transaction series namesYorick Peterse2016-01-043-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | This ensures Rails and Sidekiq transactions are split into the series "rails_transactions" and "sidekiq_transactions" respectively.
| * | | | Use separate series for Rails/Sidekiq sample statsYorick Peterse2016-01-041-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for any tags to differentiate between Sidekiq and Rails statistics while still being able to separate the two.
| * | | | Track total method call times per transactionYorick Peterse2016-01-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to see where time is spent without having to aggregate all the individual points in the method_calls series.
| * | | | Track total query/view timings in transactionsYorick Peterse2016-01-042-0/+23
| | | | |
| * | | | Ability to increment custom transaction valuesYorick Peterse2016-01-041-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used to store/increment the total query/view rendering timings on a per transaction basis. This in turn can greatly reduce the amount of metrics stored.
| * | | | Removed tracking of hostnames for metricsYorick Peterse2015-12-312-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | This isn't hugely useful and mostly wastes InfluxDB space. We can re-add this whenever needed (but only once we really need it).
| * | | | Use separate series for Rails/Sidekiq transactionsYorick Peterse2015-12-314-8/+10
| | | | | | | | | | | | | | | | | | | | This removes the need for tagging all metrics with a "process_type" tag.
| * | | | Cache InfluxDB settings after the first useYorick Peterse2015-12-311-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | This ensures we don't need to load anything from either PostgreSQL or the Rails cache whenever creating new InfluxDB connections.
| * | | | Removed tracking of raw SQL queriesYorick Peterse2015-12-312-95/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This particular setup had 3 problems: 1. Storing SQL queries as tags is very inefficient as InfluxDB ends up indexing every query (and they can get pretty large). Storing these as values instead means we can't always display the SQL as easily. 2. We already instrument ActiveRecord query methods, thus we already have timing information about database queries. 3. SQL obfuscation is difficult to get right and I'd rather not expose sensitive data by accident.
* | | | Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue.debug-banzai-cacheDouwe Maan2016-01-041-7/+14
| | | |
* | | | Merge branch 'autocomplete-performance' into 'master' Dmitriy Zaporozhets2016-01-045-5/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improving autocomplete performance part 2 Related issue: gitlab-org/gitlab-ce#3507 See merge request !2253
| * | | | Optimize CSS expressions produced by Nokogiriautocomplete-performanceYorick Peterse2015-12-313-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nokogiri produces inefficient XPath expressions when given CSS expressions such as "a.gfm". Luckily these expressions can be optimized quite easily while still achieving the same results. In the two cases where this optimization is applied the run time has been reduced from around 170 ms to around 15 ms.
| * | | | Don't use delegate to delegate trivial methodsYorick Peterse2015-12-311-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Around 300 ms (in total) would be spent in these delegated methods due to the extra stuff ActiveSupport adds to the compiled methods. Because these delegations are so simple we can just manually define the methods, saving around 275 milliseconds.
| * | | | Use XPath for searching link nodesYorick Peterse2015-12-311-2/+2
| |/ / / | | | | | | | | | | | | | | | | This is a tad faster than letting Nokogiri figure out whether it should evaluate the query as CSS or XPath and then actually evaluating it.
* | | | Simplify `ContributionsCalendar#starting_year` and `#starting_month`Robert Speicher2016-01-011-2/+2
|/ / /
* | | Removed various default metrics tagsreduce-influxdb-tagsYorick Peterse2015-12-311-5/+2
|/ / | | | | | | | | | | | | | | 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.
* | Make sure that is no pending migrations in Gitlab::CurrentSettingsfix-buildDouglas Barbosa Alexandre2015-12-301-1/+3
| |
* | Merge branch 'upvote_count_to_api' into 'master' Valery Sizov2015-12-291-1/+0
|\ \ | | | | | | | | | | | | | | | | | | Revert upvotes and downvotes params back to MR API issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 See merge request !2212
| * | Revert upvotes and downvotes params to MR APIValery Sizov2015-12-281-1/+0
| | |
* | | Use Gitlab::CurrentSettings for InfluxDBYorick Peterse2015-12-291-25/+11
| | | | | | | | | | | | | | | This ensures we can still start up even when not connecting to a database.
View Lorry Controller Status