summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix memory leak with use of RequestStoreuse-request-store-storeStan Hu2016-07-284-5/+6
| | | | | Use RequestStore.store to ensure objects are cleared out properly via `RequestStore#clear!`
* Merge branch 'ci-icons-again' into 'master' Jacob Schatz2016-07-286-67/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace ci icons with slightly thicker ones ## What does this MR do? Adds updated CI icons ## Why was this MR needed? New CI icons were a tad too thin ## What are the relevant issue numbers? Closes #20089 ## Screenshots (if relevant) ![Screen_Shot_2016-07-26_at_8.59.28_AM](/uploads/35671085829fd64f8a9cf98704661ece/Screen_Shot_2016-07-26_at_8.59.28_AM.png) See merge request !5475
| * Replace ci icons with slightly thicker onesci-icons-againAnnabel Dunstone2016-07-266-67/+24
| |
* | Merge branch 'remove-unpullable-project' into 'master' Robert Speicher2016-07-281-1/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove project which can't be pulled while seeding This project can't be pulled from GH when running `SIZE=20 rake dev:setup` [ci skip] See merge request !5559
| * | Remove project which can't be pulled while seedingZ.J. van de Weg2016-07-281-1/+0
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'log-project-deletion' into 'master' Stan Hu2016-07-281-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a log message when a project is scheduled for destruction for debugging We have a lot of projects that are in `pending_delete` state. It's not clear whether they were ever scheduled for destruction, or whether Sidekiq just dropped the job due to `MemoryKiller` or some other reason. Also this will provide a record of which user destroys a project. #20365 See merge request !5540
| * | | Add a log message when a project is scheduled for destruction for debuggingStan Hu2016-07-281-1/+4
| |/ /
* | | Merge branch 'new-issue-by-email' into 'master' Douwe Maan2016-07-2825-264/+686
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2845-270/+707
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. ...
| * | | Remove extra entries from auto-merge accidentLin Jen-Shin2016-07-281-2/+0
| | | |
| * | | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-2774-217/+721
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | Test both for having existing issues or notLin Jen-Shin2016-07-271-2/+12
| | | | |
| * | | | Merge some repeated codes to the partialLin Jen-Shin2016-07-272-9/+7
| | | | |
| * | | | Add CHANGELOG entry for creating new issues from emailLin Jen-Shin2016-07-271-0/+1
| | | | |
| * | | | Update the description a bitLin Jen-Shin2016-07-261-2/+2
| | | | |
| * | | | Test if we're showing the modal and has the right emailLin Jen-Shin2016-07-261-0/+19
| | | | |
| * | | | Fix duplicated issues partial and two cases need the button:Lin Jen-Shin2016-07-261-10/+10
| | | | | | | | | | | | | | | | | | | | For both having existing issues and having no issues.
| * | | | Merge remote-tracking branch 'upstream/master' into new-issue-by-emailLin Jen-Shin2016-07-26811-25282/+35189
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1525-94/+117
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-151697-12167/+51150
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | | | Links markdown text to docsPhil Hughes2016-07-061-1/+3
| | | | | | | |
| * | | | | | | Uses input field for email addressPhil Hughes2016-07-012-4/+18
| | | | | | | |
| * | | | | | | Added new issue by email modal windowPhil Hughes2016-06-304-1/+44
| | | | | | | |
| * | | | | | | Only return the address if incoming emails is enabled:Lin Jen-Shin2016-06-242-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3363#note_12669123
| * | | | | | | Add Project#new_issue_address(author):Lin Jen-Shin2016-06-232-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Which would return the email address for creating a new issue by sending an email to that particular address.
| * | | | | | | raise UnknownIncomingEmail when there's no mail_key:Lin Jen-Shin2016-06-202-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | |
| * | | | | | | Add missing require in testsLin Jen-Shin2016-06-151-0/+1
| | | | | | | |
| * | | | | | | 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
| | | | | | | |
| * | | | | | | An instruction for what to doLin Jen-Shin2016-06-151-1/+1
| | | | | | | |
| * | | | | | | 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-151732-9593/+33514
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | | | | Split tests into their own classesLin Jen-Shin2016-05-244-233/+239
| | | | | | | | |
| * | | | | | | | This is easier to read for me. No early returnLin Jen-Shin2016-05-241-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/commit/76dbafba86dda96b7ba2f93fc7e07eea3ca48302#note_4575102
| * | | | | | | | Merge the places where exceptions could be raisedLin Jen-Shin2016-05-245-6/+16
| | | | | | | | |
| * | | | | | | | 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-203-6/+6
| | | | | | | | |
| * | | | | | | | Use the authentication_token for finding the userLin Jen-Shin2016-05-202-13/+4
| | | | | | | | |