summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Remove the use of `is_shared` of `Ci::Runner`remove-is-shared-from-ci-runnersKamil Trzciński2018-06-264-8/+8
|
* Merge branch 'enforce-variable-value-to-be-a-string' into 'master'Grzegorz Bizon2018-06-251-0/+3
|\ | | | | | | | | | | | | Enforce setting string as value of the CI/CD variable Closes #48210 See merge request gitlab-org/gitlab-ce!20061
| * Enforce setting string as value of the CI/CD variableTomasz Maczukin2018-06-251-0/+3
| |
* | Merge branch 'jprovazn-rails5-mysql-datetime' into 'master'Yorick Peterse2018-06-251-0/+18
|\ \ | | | | | | | | | | | | | | | | | | [Rails5] Fix MysqlDateTimeWithTimeZone in rails 5 Closes #46275 See merge request gitlab-org/gitlab-ce!19613
| * | Mysql fixes for Rails 5jprovazn-rails5-mysql-datetimeJan Provaznik2018-06-211-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `MysqlDateTimeWithTimeZone` inherits from `ActiveRecord::Type::DateTime` (`MysqlDateTime` is not present in Rails 5) * explicitly set `NULL` default value for `merge_request_diff_files`'s `diff` column (otherwise empty string is used in a migration) and empty string is not allowed for text/blob fields in Mysql * disable NO_ZERO_DATE mode for all Mysql DB connections, otherwise SQL queries fail on inserting `0` value for `created_at` column
* | | Merge branch 'zj-commit-raw-diffs' into 'master'Douwe Maan2018-06-221-7/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Raw diffs are served from Gitaly Closes gitaly#222 See merge request gitlab-org/gitlab-ce!20091
| * | | Raw diffs are served from Gitalyzj-commit-raw-diffsZeger-Jan van de Weg2018-06-221-7/+3
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/222
* | | | Merge branch 'rs-lib-gitlab-git-gitlab_projects-parity' into 'master'Robert Speicher2018-06-221-12/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE-EE parity for lib/gitlab/git/gitlab_projects.rb See merge request gitlab-org/gitlab-ce!20047
| * | | | CE-EE parity for lib/gitlab/git/gitlab_projects.rbrs-lib-gitlab-git-gitlab_projects-parityRobert Speicher2018-06-201-12/+13
| | | | |
* | | | | Merge branch 'zj-find-ref-name' into 'master'Douwe Maan2018-06-221-11/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindRefName RPC now mandatory Closes gitaly#221 See merge request gitlab-org/gitlab-ce!20090
| * | | | | FindRefName RPC now mandatoryzj-find-ref-nameZeger-Jan van de Weg2018-06-221-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Has never been in OPT_OUT, dispite being ages old. The time where feature flags are still set by env vars. Closes https://gitlab.com/gitlab-org/gitaly/issues/221
* | | | | | Merge branch 'bjk/48176_ruby_gc' into 'master'Yorick Peterse2018-06-221-12/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ruby sampler metrics See merge request gitlab-org/gitlab-ce!20039
| * | | | | | Cleanup ruby sampler metricsbjk/48176_ruby_gcBen Kochie2018-06-221-12/+14
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use a simple counter for sampler duration instead of a histogram. * Use a counter to collect GC time. * Remove unused objects metric. * Cleanup metric names to match Prometheus conventions. * Prefix generic GC stats with `gc_stat`. * Include worker label on memory and file descriptor metrics.
* | | | | | Merge branch 'zj-repository-size' into 'master'Douwe Maan2018-06-221-15/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repository size is Gitaly only Closes gitaly#393 See merge request gitlab-org/gitlab-ce!20089
| * | | | | | Repository size is Gitaly onlyzj-repository-sizeZeger-Jan van de Weg2018-06-221-15/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/393
* | | | | | Merge branch 'docs-request-cache' into 'master'Sean McGivern2018-06-221-36/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for RequestCache Closes #48094 See merge request gitlab-org/gitlab-ce!20064
| * | | | | Add docs for RequestCache, moved from commentsLin Jen-Shin2018-06-221-36/+1
| | |_|_|/ | |/| | |
* | | | | Git ls files is Gitaly only nowZeger-Jan van de Weg2018-06-221-34/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Moved to the front on the line through: https://gitlab.com/gitlab-org/gitlab-ce/issues/47893 Closes: https://gitlab.com/gitlab-org/gitlab-ce/issues/47893 Closes: https://gitlab.com/gitlab-org/gitaly/issues/327
* | | | Merge branch 'blackst0ne-fix-protect-from-forgery-in-application-controller' ↵Douwe Maan2018-06-221-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' [Rails5] Force the `protect_from_forgery` callback run first Closes #48204 See merge request gitlab-org/gitlab-ce!20055
| * | | [Rails5] Force the `protect_from_forgery` callback run firstblackst0ne-fix-protect-from-forgery-in-application-controllerblackst0ne2018-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Rails 5.0 the `protect_from_forgery` callback doesn't run first by default anymore. [1] Instead it gets inserted into callbacks chain where callbacks get called in order. This commit forces the callback to run first. [1]: https://github.com/rails/rails/commit/39794037817703575c35a75f1961b01b83791191
* | | | Merge branch 'restore-custom-hooks-wiki' into 'master'Douwe Maan2018-06-211-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Restore custom hooks for wiki See merge request gitlab-org/gitlab-ce!20065
| * | | | Restore custom hooks for wikirestore-custom-hooks-wikiAhmad Hassan2018-06-211-0/+2
| | |/ / | |/| |
* | | | Changes tab VUE refactoringFelipe Artur2018-06-213-12/+60
|/ / /
* | | Merge branch 'da-usage-ping' into 'master'Sean McGivern2018-06-211-8/+8
|\ \ \ | | | | | | | | | | | | | | | | Add enabled prefix to feature keys to be consistent with other keys See merge request gitlab-org/gitlab-ce!20043
| * | | Add enabled prefix to feature keys to be consistent with other keysda-usage-pingDouglas Barbosa Alexandre2018-06-201-8/+8
| | | |
* | | | Raw changes calculation is Gitaly only nowZeger-Jan van de Weg2018-06-211-19/+4
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/1138
* | | | Merge branch 'mk/fix-n-plus-1-queries-in-uploads-check-rake-task' into 'master'Stan Hu2018-06-201-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix N+1 queries in uploads check rake task Closes #47924 See merge request gitlab-org/gitlab-ce!20012
| * | | Avoid N+1 queries while processing uploadsMichael Kozono2018-06-201-1/+1
| |/ /
* | | Merge branch 'bvl-dont-generate-mo' into 'master'Rubén Dávila2018-06-201-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't generate `.mo` files Closes #47979 See merge request gitlab-org/gitlab-ce!20048
| * | | Don't generate `.mo` filesBob Van Landuyt2018-06-201-1/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Since we are only using `.po` files for translation we can shave off some setup time. Generating the `mo` files also regenerates the PO-files, including fuzzy translations. Those cause a lot of bugs, and we don't need them anymore since the `po` files are generated by an external translation service.
* | | Merge branch 'unify-lib-tasks' into 'master'Robert Speicher2018-06-202-2/+2
|\ \ \ | |_|/ |/| | | | | | | | Unify flay.rake and gettext.rake from EE See merge request gitlab-org/gitlab-ce!20041
| * | Unify flay.rake and gettext.rake from EEunify-lib-tasksLin Jen-Shin2018-06-212-2/+2
| | |
* | | Merge branch '47488-remove-unmergeable-notification-for-no-commits' into ↵Robert Speicher2018-06-201-2/+5
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 'master' Notify only merge request unmergeable due to conflict See merge request gitlab-org/gitlab-ce!19548
| * | Fix possiblilty of branch not found47488-remove-unmergeable-notification-for-no-commitsMark Chao2018-06-201-2/+5
| |/ | | | | | | | | | | This now can happen because can_be_merged? is called during MR merge_status transition to cannot_be_merged. It is possible branch_name is invalid.
* | Merge branch 'limit-metrics-content-type' into 'master'Stan Hu2018-06-201-2/+7
|\ \ | | | | | | | | | | | | Limit the action suffixes in transaction metrics See merge request gitlab-org/gitlab-ce!20032
| * | Limit the action suffixes in transaction metricslimit-metrics-content-typeYorick Peterse2018-06-201-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seem to be a lot of cases where the suffix of an action (e.g. ".html") is set to bogus data, such as "*/*" or entire URLs. This can increase cardinality of our metrics, and isn't very useful for monitoring and filtering. To work around this, we enforce a whitelist containing a few suffixes we actually care about. Suffixes not supported will be grouped under the action without a suffix. This means that a request to "FooController#bar.jpeg" will be assigned to "FooController#bar".
* | | Merge branch 'remove-allocations-gem' into 'master'Stan Hu2018-06-202-16/+0
|\ \ \ | |_|/ |/| | | | | | | | Remove remaining traces of the Allocations Gem See merge request gitlab-org/gitlab-ce!20029
| * | Remove remaining traces of the Allocations Gemremove-allocations-gemYorick Peterse2018-06-202-16/+0
| |/ | | | | | | | | | | | | In MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15834 we removed use of the data produced by the Allocations Gem. However, we never removed the code that just enables tracking of allocations. In this commit we remove all remaining traces of this Gem.
* | Merge branch 'bvl-errors-in-static-analysis' into 'master'Sean McGivern2018-06-202-13/+30
|\ \ | | | | | | | | | | | | | | | | | | Updates to the `gettext:updated_check` Closes #48113 See merge request gitlab-org/gitlab-ce!20002
| * | More verbose errors in static-analysisBob Van Landuyt2018-06-202-13/+30
| | | | | | | | | | | | This makes the output in static analysis a bit more verbose.
* | | Merge branch 'zj-can-be-merged' into 'master'Douwe Maan2018-06-201-15/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move mergablility check to Gitaly Closes gitaly#889 See merge request gitlab-org/gitlab-ce!20019
| * | | Move mergablility check to Gitalyzj-can-be-mergedZeger-Jan van de Weg2018-06-201-15/+2
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/889
* | | | Fix: Serve favicon image always from the main GitLab domain to avoid issues ↵Alexis Reigel2018-06-201-5/+15
| |/ / |/| | | | | | | | with CORS
* | | Resolve "Unable to install Prometheus on Clusters: 'Error: Chart ↵Mayra Cabrera2018-06-201-3/+8
| |/ |/| | | | | incompatible with Tiller v2.7.0'"
* | Merge branch 'use-backup-custom-hooks-gitaly' into 'master'Douwe Maan2018-06-202-64/+108
|\ \ | | | | | | | | | | | | Use gitaly for backup rake task See merge request gitlab-org/gitlab-ce!19742
| * | Move backup custom hooks up a leveluse-backup-custom-hooks-gitalyAhmad Hassan2018-06-201-4/+2
| | |
| * | Output done for wiki and repoAhmad Hassan2018-06-191-14/+3
| | |
| * | Migrate repo backup to gitalyAhmad Hassan2018-06-152-54/+111
| | |
* | | More gitaly disk access blocksJacob Vosmaer (GitLab)2018-06-202-0/+2
| | |
* | | Merge branch 'ce-5024-filename-search' into 'master'Sean McGivern2018-06-203-5/+90
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Implement filtering by filename on code search Closes #43627 See merge request gitlab-org/gitlab-ce!19509
View Lorry Controller Status