summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add structured logging for Rails processessh-structured-loggingStan Hu2017-07-184-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | This introduces JSON logging for Rails views saved to a file called `development_json.log`, `production_json.log`, etc. For example, instead of this unparsable log: ``` Started GET "/" for 127.0.0.1 at 2012-03-10 14:28:14 +0100 Processing by HomeController#index as HTML Rendered text template within layouts/application (0.0ms) Rendered layouts/_assets.html.erb (2.0ms) Rendered layouts/_top.html.erb (2.6ms) Rendered layouts/_about.html.erb (0.3ms) Rendered layouts/_google_analytics.html.erb (0.4ms) Completed 200 OK in 79ms (Views: 78.8ms | ActiveRecord: 0.0ms) ``` We get a single line with this: ``` {"method":"GET","path":"/,"format":"html","controller":"HomeController","action":"index","status":200,"duration":79,"view":78.8,"db":0.0,"location":"http://localhost/","time":"2017-07-18 09:35:17 -0700"} ``` Part of #20060
* Merge branch 'master' into 'master'Clement Ho2017-07-182-0/+8
|\ | | | | | | | | | | | | reset text-align to initial to let elements with dir="auto" align texts to right… Closes #13281 See merge request !12892
| * reset text-align to initial to let elements with dir="auto" align texts to ↵goshkob2017-07-182-0/+8
|/ | | | right…
* Merge branch 'backstage/gb/add-index-and-foreign-key-to-merge-requests' into ↵Kamil Trzciński2017-07-185-3/+100
|\ | | | | | | | | | | | | | | | | 'master' Add a foreign key to `merge_requests.head_pipeline_id` Closes #34065 See merge request !12837
| * Use batching to clear orphans in head_pipeline migrationbackstage/gb/add-index-and-foreign-key-to-merge-requestsGrzegorz Bizon2017-07-182-3/+51
| |
| * Nullify orphaned head_pipeline_ids in merge_requestsGrzegorz Bizon2017-07-181-0/+8
| |
| * Add a foreign key to `merge_requests.head_pipeline_id`Grzegorz Bizon2017-07-184-3/+44
| |
* | Merge branch '34915-do-not-install-fog-aws-in-prepare_build' into 'master'Robert Speicher2017-07-182-1/+2
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Test/Production environment imparity in nokogiri" Closes #34915 See merge request !12842
| * | Don't install fog-aws and mime-types gems in scripts/prepare_build.sh34915-do-not-install-fog-aws-in-prepare_buildRémy Coutable2017-07-132-1/+2
| | | | | | | | | | | | | | | | | | Instead, install them only for the 'update-knapsack' job. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'request-store-wrap' into 'master'Rémy Coutable2017-07-1810-30/+258
|\ \ \ | | | | | | | | | | | | | | | | Add RequestCache to cache via RequestStore See merge request !12920
| * | | Remove unneeded asserts and add tests for inactive RequestStoreLin Jen-Shin2017-07-181-28/+20
| | | |
| * | | Rename the methods to make it fit with current nameLin Jen-Shin2017-07-184-20/+20
| | | |
| * | | Follow feedback on the merge requestLin Jen-Shin2017-07-185-19/+15
| | | |
| * | | Cache Note#notable for commits and fix testsrequest-store-wrapLin Jen-Shin2017-07-184-5/+11
| | | |
| * | | Add changelog entryLin Jen-Shin2017-07-181-0/+4
| | | |
| * | | Update the comments for the new functionalityLin Jen-Shin2017-07-181-3/+19
| | | |
| * | | Use RequestStoreWrap for Commit#authorLin Jen-Shin2017-07-184-58/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We also try to use instance variable to cache the result if RequestStore is not available, so we could keep the same logic, using the same cache key. Also introduce a way to specify method specific cache key
| * | | Add RequestStoreWrap to cache via RequestStoreLin Jen-Shin2017-07-173-4/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't like the idea of `RequestStore` at all, because it's just a global state which shouldn't be used at all. But we have a number of places calling `ProtectedBranch.protected?` and `ProtectedTag.protected?` in a loop for the same user, project, and ref whenever we're checking against if the jobs for a given pipeline is accessible for a given user. This means we're effectively making N queries for the same thing over and over. To properly fix this, we need to change how we check the permission, and that could be a huge work. To solve this quickly, adding a cache layer for the given request would be quite simple to do. We're already doing this in Commit#author, and this is extending that idea and make it generalized.
* | | | Merge branch '34927-protect-manual-actions-on-tags' into 'master'Grzegorz Bizon2017-07-183-9/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protect manual actions against protected tag too Closes #34927 See merge request !12908
| * | | | Make sure it checks against the tag only when it's a tag34927-protect-manual-actions-on-tagsLin Jen-Shin2017-07-182-1/+23
| | | | |
| * | | | Add changelog entryLin Jen-Shin2017-07-171-0/+4
| | | | |
| * | | | Protect manual actions against protected tag tooLin Jen-Shin2017-07-172-9/+23
| | | | |
* | | | | Merge branch 'perf/policy-class-cache' into 'master'Sean McGivern2017-07-183-17/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Perf: Improve performance of basic ruby ops in DeclarativePolicy See merge request !12922
| * | | | | cache the cache key...perf/policy-class-cachehttp://jneen.net/2017-07-171-7/+8
| | | | | |
| * | | | | avoid #respond_to? in Cache.id_forhttp://jneen.net/2017-07-171-5/+8
| | | | | |
| * | | | | cache DeclarativePolicy.class_for at the class levelhttp://jneen.net/2017-07-171-5/+35
| | | | | |
* | | | | | Merge branch '35225-transient-poll' into 'master'Phil Hughes2017-07-184-23/+37
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix transient rspec failure due to Poll.js race condition Closes #35225 See merge request !12930
| * | | | | fix transient rspec failure due to Poll.js race condition35225-transient-pollSimon Knox2017-07-184-23/+37
| | | | | | | | | | | | | | | | | | | | | | | | don't treat aborted requests as failures, they are often triggered during unload (e.g after clicking a link)
* | | | | | Merge branch 'an-rename-gitaly-services' into 'master'Sean McGivern2017-07-1814-61/+61
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed Gitaly services Closes gitaly#379 See merge request !12854
| * | | | | | Renamed Gitaly servicesAndrew Newdigate2017-07-1814-61/+61
|/ / / / / /
* | | | | | Merge branch 'patch-24' into 'master'Sean McGivern2017-07-181-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 9.3-to-9.4.md See merge request !12925
| * | | | | | Update 9.3-to-9.4.mdAndrew Newdigate2017-07-171-2/+1
| | | | | | |
* | | | | | | Merge branch '29901-refactor-initialization-dropzone_input.js' into 'master'Clement Ho2017-07-182-47/+58
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor variables initialization in dropzone_input.js Closes #29901 See merge request !12768
| * | | | | | Refactor variables initialization in dropzone_input.jsBrandon Everett2017-07-182-47/+58
|/ / / / / /
* | | | | | Merge branch '34831-remove-coffee-rails-gem' into 'master'Jacob Schatz2017-07-175-11/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove coffee-rails gem Closes #34831 See merge request !12715
| * | | | | | Remove .coffee ext files for i18nTakuya Noguchi2017-07-082-2/+1
| | | | | | |
| * | | | | | Remove coffee-rails gemTakuya Noguchi2017-07-083-9/+4
| | | | | | |
* | | | | | | Merge branch '35177-dropdown-padding' into 'master'Annabel Dunstone Gray2017-07-173-21/+20
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix padding on filtered search Closes #35177 See merge request !12913
| * | | | | | fix padding on filtered search dropdown. Styles should only apply to li in listSimon Knox2017-07-183-21/+20
| | |/ / / / | |/| | | |
* | | | | | Merge branch ↵Sean McGivern2017-07-171-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34940-peek-performance-bar-doesn-t-count-cached-queries-but-shows-them' into 'master' Resolve "Peek performance bar doesn't count cached queries, but shows them" Closes #34940 See merge request !12915
| * | | | | | Don't track cached queries in Gitlab::PerformanceBar::PeekQueryTracker34940-peek-performance-bar-doesn-t-count-cached-queries-but-shows-themRémy Coutable2017-07-171-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch '31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queue' into ↵Rémy Coutable2017-07-173-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Don't let webhooks jobs go to the dead jobs queue" Closes #31571 See merge request !12918
| * | | | | | | Skip dead jobs queue for web hooks and project services31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queueSean McGivern2017-07-173-1/+8
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These jobs may legitimately fail because the endpoint just isn't there any more. We don't want them cluttering up the Sidekiq morgue in that case - it's currently full on GitLab.com.
* | | | | | | Merge branch 'group-sub-settings-new-sidebar' into 'master'Annabel Dunstone Gray2017-07-171-1/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added sub-nav to new group sidebar settings Closes #35140 See merge request !12907
| * | | | | | | Added sub-nav to new group sidebargroup-sub-settings-new-sidebarPhil Hughes2017-07-171-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #35140
* | | | | | | | Merge branch 'project-sidebar-members' into 'master'Annabel Dunstone Gray2017-07-171-3/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed project members link not staying active Closes gitlab-ee#2942 See merge request !12882
| * | | | | | | Fixed project members link not staying activeproject-sidebar-membersPhil Hughes2017-07-141-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'ee-2950-fix-namespace-visibility-level-helpers' into 'master'Sean McGivern2017-07-173-5/+13
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Promote visibility level helpers from Group to Namespace Closes gitlab-ee#2950 See merge request !12910
| * | | | | | | Promote visibility level helpers from Group to NamespaceNick Thomas2017-07-173-5/+13
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | In EE, we make use of `namespace#public?` in projects. When the project is in a personal namespace, this breaks as the `public?` helper isn't present.
* | | | | | | Merge branch '35164-cycle-analytics-firefox' into 'master'Phil Hughes2017-07-172-2/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move click handler to button. when on the icon it wasn't triggered in firefox Closes #35164 See merge request !12905
View Lorry Controller Status