summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Method for returning issues readable by a userability-batch-issue-checkingYorick Peterse2016-07-291-3/+4
| | | | | | | | | | | | | The method Ability.issues_readable_by_user takes a list of users and an optional user and returns an Array of issues readable by said user. This method in turn is used by Banzai::ReferenceParser::IssueParser#nodes_visible_to_user so this method no longer needs to get all the available abilities just to check if a user has the "read_issue" ability. To test this I benchmarked an issue with 222 comments on my development environment. Using these changes the time spent in nodes_visible_to_user was reduced from around 120 ms to around 40 ms.
* Merge branch 'new-issue-by-email' into 'master' Douwe Maan2016-07-286-85/+222
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement #3243 New Issue by email So we extend Gitlab::Email::Receiver for this new behaviour, however we might want to split it into another class for better testing it. Another issue is that, currently it's using this to parse project identifier: Gitlab::IncomingEmail.key_from_address Which is using: Gitlab.config.incoming_email.address for the receiver name. This is probably `reply` because it's used for replying to a specific issue. We might want to introduce another config for this, or just use `reply` instead of `incoming`. I'll prefer to introduce a new config for this, or just change `reply` to `incoming` because it would make sense for replying to there, too. The email template used in tests were copied and modified from: `emails/valid_reply.eml` which I hope is ok. /cc @DouweM #3243 See merge request !3363
| * Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-283-19/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (45 commits) Replace reject_blocked with reject_blocked! in callbacks. Fix Project#to_param to keep invalid project suitable for use in URLs Update CHANGELOG Add feature specs for edit project settings Fix renaming repository when name contains invalid chars under settings Change requests_profiles resource constraint to catch virtually any file Allow skipping users in autocomplete Fix typo in CHANGELOG Update CHANGELOG Respective cache is now expired when creating a new branch Update CHANGELOG Unify HTML format in static error pages Make error pages responsive design Move color-logic into HipchatService#HipchatService Depened on exact version of SimpleCov when patched Refactor spam validation to a concern that can be easily reused and improve legibility in `SpamCheckService` Refactor `SpamCheckService` to make it cleaner and clearer. Submit all issues on public projects to Akismet if enabled. Submit new issues created via the WebUI by non project members to Akismet for spam check. Upgrade Bullet from 5.0.0 to 5.2.0. ...
| * \ Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-278-5/+137
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (38 commits) Remove useless new route Update gitlab-shell version to 3.2.1 in the 8.9->8.10 update guide Fix typo in Elixir CI template Add a spec for access_for_user_ids Fix typo in comment Rubocop offenses Optimize the invited group link access level check Incorporate review comments Optimize maximum user access level lookup in loading of notes Fix missing schema update for 20160722221922 Whitelist 'Simplified BSD' license Fix a bug where forking a project from a repository storage to another would fail Remove inline scripts from import pages. Make branches sortable without push permission (!5462) Profile requests when a header is passed Upgrade database_cleaner from 1.4.1 to 1.5.3. Show release notes in tag list Fix expand all diffs button in compare view Add route for Import::GithubController#new Update CHANGELOG ...
| * \ \ Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-2664-638/+926
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (620 commits) Added '*.js.es6 gitlab-language=javascript' to .gitattributes Fix CI status icon link underline Update CHANGELOG after 8.10.1 Add CHANGELOG Add es6 gem Instrument Nokogiri parsing methods Fix backup restore Use project ID in repository cache to prevent stale data from persisting across projects Add iid to MR API response `WikiPage` should have a slug even when not persisted. ES6ify all the things! Make fork counter always clickable (!5463) Revert "Merge branch '17073-tagscontroller-index-is-terrible-response-time-goes-up-to-5-…" Fix CHANGELOG Add spec for dashes in paths Fix Error 500 when creating Wiki pages with hyphens or spaces Add links to the real markdown.md file for all GFM examples Remove magic comments from Ruby files (!5456) Ignore invalid trusted proxies in X-Forwarded-For header remove search_id for label dropdown filter ...
| * \ \ \ Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-153-26/+42
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: navbar_icon was renamed to custom_icon in: Fix spec Don't attempt to disable statement timeout on a MySQL DB Disable statement timeout outside of transaction and during adding concurrent index Disable PostgreSQL statement timeout during migrations Add visibility icon Remove previously introduced CSS that will not be used anymore Make admin/groups view consistent with dashboard/groups Fix New Group button spacing on mobile Make CSS consistent again Rename .group-controls to .controls Remove unnecesary CSS class Change bg color of collapsed diff to blue on hover Reduce padding on collapsed diff message updated changelog fixed similar issue with gitlab.com importer because why not! fix updated_at not preserved after import - for GitLab projects Update permissons links to new page CHANGELOG Changed collapsed assignee tooltip to users name Fixes tooltip when updating the assignee Refresh branch cache after `git gc`
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-15178-1118/+4269
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (1547 commits) Add margin between buttons if both retry and cancel are present Add margin between labels; remove underline hover style on status button udpated JS based on feedback Use default cursor for table header of project files (!5165) Fix duplicated entry in changelog [ci skip] Improves left static sidebar behaviour Include default callback URL (OAuth) Cleanup feature proposal template Simplify regex for string-based multi-word label surrounded in quotes Revert "Merge branch '18193-developers-can-merge' into 'master' " Upgrade Rails from 4.2.6 to 4.2.7. some JS magic to fix empty URL bug formats my test properly Update CHANGELOG Doesn't match empty label references surrounded in quotes Fix markdown rendering for label references that contains `.` Fix markdown rendering for label references that begin with a digit Fix markdown rendering for consecutive label references Stub omniauth provider for GitLab Update CHANGELOG ...
| * | | | | | raise UnknownIncomingEmail when there's no mail_key:Lin Jen-Shin2016-06-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that we don't have to pretend that CreateNoteHandler could handle a nil mail_key. Also, since NilClass#=~ would just return nil for any regular expression, we could just match it without checking nilness. Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3363#note_12566407
| * | | | | | Use keyword args to be more clear:Lin Jen-Shin2016-06-203-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3363#note_12566374
| * | | | | | Use a separate line for separate actions:Lin Jen-Shin2016-06-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3363#note_12420487
| * | | | | | Only pass item nameLin Jen-Shin2016-06-153-11/+6
| | | | | | |
| * | | | | | More space for private concernLin Jen-Shin2016-06-152-0/+2
| | | | | | |
| * | | | | | Save the list of handlers in a constantLin Jen-Shin2016-06-151-1/+3
| | | | | | |
| * | | | | | Raise first like an input checkLin Jen-Shin2016-06-151-5/+3
| | | | | | |
| * | | | | | Avoid assignment in ifLin Jen-Shin2016-06-151-1/+2
| | | | | | |
| * | | | | | Blank line for privateLin Jen-Shin2016-06-151-0/+1
| | | | | | |
| * | | | | | A blank line to separate exception raisingLin Jen-Shin2016-06-151-0/+1
| | | | | | |
| * | | | | | Avoid using bang bangLin Jen-Shin2016-06-151-1/+1
| | | | | | |
| * | | | | | Rename to project_path which is more accurateLin Jen-Shin2016-06-151-3/+3
| | | | | | |
| * | | | | | Remove empty lines at the beginning of filesLin Jen-Shin2016-06-152-2/+0
| | | | | | |
| * | | | | | Merge branch 'master' into new-issue-by-emailLin Jen-Shin2016-06-15142-1027/+2877
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1246 commits) Update CHANGELOG Update tests to make it work with Turbolinks approach Use Turbolink instead of ajax Reinitialize checkboxes to toggle event bindings Turn off handlers before binding events Removed console.log Uses outerWidth instead of width Revert "Added API endpoint for Sidekiq Metrics" Added API endpoint for Sidekiq Metrics Added CHANGELOG entry for allocations Gem/name fix Filter out classes without names in the sampler Update the allocations Gem to 1.0.5 Put all sidebar icons in fixed width container Instrument private/protected methods Fix Ci::Build#artifacts_expire_in= when assigning invalid duration Fix grammar and syntax Update CI API docs UI and copywriting improvements Factorize members mails into a new Emails::Members module Factorize access request routes into a new :access_requestable route concern Factorize #request_access and #approve_access_request into a new AccessRequestActions controller concern ...
| * | | | | | | Merge the places where exceptions could be raisedLin Jen-Shin2016-05-243-6/+6
| | | | | | | |
| * | | | | | | use split and try to unify error raisingLin Jen-Shin2016-05-233-12/+10
| | | | | | | |
| * | | | | | | Add ! for verify_record! because it could raiseLin Jen-Shin2016-05-213-3/+3
| | | | | | | |
| * | | | | | | Rename handlers and introduce Handler.forLin Jen-Shin2016-05-215-64/+74
| | | | | | | |
| * | | | | | | Only set @raw for receiver, and handle the rest in executeLin Jen-Shin2016-05-201-11/+12
| | | | | | | |
| * | | | | | | It's for Message-ID so it should be message_idLin Jen-Shin2016-05-202-4/+4
| | | | | | | |
| * | | | | | | Use the authentication_token for finding the userLin Jen-Shin2016-05-201-10/+1
| | | | | | | |
| * | | | | | | Give ProjectNotFound when the project is not readableLin Jen-Shin2016-05-182-4/+1
| | | | | | | |
| * | | | | | | so we use separate classes to handle different tasksLin Jen-Shin2016-05-185-154/+215
| | | | | | | |
| * | | | | | | We should totally cache itLin Jen-Shin2016-05-161-3/+1
| | | | | | | |
| * | | | | | | Report better errors. TODO: Enable skipped testLin Jen-Shin2016-05-161-2/+9
| | | | | | | |
| * | | | | | | Now we would be validating authentication tokenLin Jen-Shin2016-05-161-3/+0
| | | | | | | |
| * | | | | | | Create a new issue via: incoming+group/project+AUTH_TOKEN@...Lin Jen-Shin2016-05-161-1/+15
| | | | | | | |
| * | | | | | | process_reply -> process_create_note; handle_reply -> process_replyLin Jen-Shin2016-05-161-5/+5
| | | | | | | |
| * | | | | | | bang to indicate that this method could raise an exceptionLin Jen-Shin2016-05-161-3/+3
| | | | | | | |
| * | | | | | | Update style as create_noteLin Jen-Shin2016-05-161-3/+6
| | | | | | | |
| * | | | | | | No need to check project because:Lin Jen-Shin2016-05-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sent_notification.project would never be nil, and we also have already checked message_project before entering process_create_issue.
| * | | | | | | Raise one by one instead of if checksLin Jen-Shin2016-05-161-10/+5
| | | | | | | |
| * | | | | | | Alloy empty reply for new issues, but not responseLin Jen-Shin2016-05-161-3/+3
| | | | | | | |
| * | | | | | | Try to give better namesLin Jen-Shin2016-05-161-6/+6
| | | | | | | |
| * | | | | | | enable Style/MethodDefParentheses and fix parenthesesLin Jen-Shin2016-05-161-1/+1
| | | | | | | |
| * | | | | | | Add another TODO that we need to verify identity betterLin Jen-Shin2016-05-161-0/+2
| | | | | | | |
| * | | | | | | Implement #3243 New Issue by emailLin Jen-Shin2016-05-161-17/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we extend Gitlab::Email::Receiver for this new behaviour, however we might want to split it into another class for better testing it. Another issue is that, currently it's using this to parse project identifier: Gitlab::IncomingEmail.key_from_address Which is using: Gitlab.config.incoming_email.address for the receiver name. This is probably `reply` because it's used for replying to a specific issue. We might want to introduce another config for this, or just use `reply` instead of `incoming`. I'll prefer to introduce a new config for this, or just change `reply` to `incoming` because it would make sense for replying to there, too. The email template used in tests were copied and modified from: `emails/valid_reply.eml` which I hope is ok.
* | | | | | | | Merge branch 'reduce-instrumentation-overhead' into 'master' Rémy Coutable2016-07-285-32/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce instrumentation overhead ## What does this MR do? This MR reduces the overhead of instrumented methods. See the commit message of 905f8d763ab1184dc0b1e4bf6f18d7981753a860 for more information. ## Are there points in the code the reviewer needs to double check? Not that I can think of. ## Why was this MR needed? The overhead of method call instrumentation was too great. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] ~~API support added~~ - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5550
| * | | | | | | | Reduce instrumentation overheadYorick Peterse2016-07-285-32/+25
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces the overhead of the method instrumentation code primarily by reducing the number of method calls. There are also some other small optimisations such as not casting timing values to Floats (there's no particular need for this), using Symbols for method call metric names, and reducing the number of Hash lookups for instrumented methods. The exact impact depends on the code being executed. For example, for a method that's only called once the difference won't be very noticeable. However, for methods that are called many times the difference can be more significant. For example, the loading time of a large commit (nrclark/dummy_project@81ebdea5df2fb42e59257cb3eaad671a5c53ca36) was reduced from around 19 seconds to around 15 seconds using these changes.
* | | | | | | | Add commit stats to commit api responsedixpac2016-07-281-0/+5
|/ / / / / / /
* | | | | | | Merge branch 'akismet-ui-check' into 'master' Douwe Maan2016-07-272-18/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Submit new issues created via the WebUI or API to Akismet for spam check on public projects. ## What does this MR do? Submit new issues created via the WebUI by non project members to Akismet for spam check. ## Why was this MR needed? Support for Akismet was added only to the API with !2266. This MR builds on that functionality to also check issues submitted via the WebUI for spam. ## What are the relevant issue numbers? Related to: - #5573 - #5932 - gitlab-com/infrastructure#14 - gitlab-com/support#61 - !2266 cc @stanhu @MrChrisW See merge request !5333
| * | | | | | | Refactor spam validation to a concern that can be easily reused and improve ↵akismet-ui-checkPatricio Cano2016-07-262-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | legibility in `SpamCheckService`
| * | | | | | | Refactor `SpamCheckService` to make it cleaner and clearer.Patricio Cano2016-07-261-4/+6
| | | | | | | |
View Lorry Controller Status