summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Improve and finish the fallback to the In-Reply-To and References header for ↵2364-fallback-to-in-reply-to-headerRémy Coutable2016-03-252-11/+15
| | | | | | | | | | | | | | | | the reply-by-email feature A few things to note: - The IncomingEmail feature is now enabled even without a correctly-formatted sub-address - Message-ID for new thread mail are kept the same so that subsequent notifications to this thread are grouped in the thread by the email service that receives the notification (i.e. In-Reply-To of the answer == Message-ID of the first thread message) - To maximize our chance to be able to retrieve the reply key, we look for it in the In-Reply-To header and the References header - The pattern for the fallback reply message id is "reply-[key]@[gitlab_host]" - Improve docs thanks to Axil
* Fix #2364. Fall back to In-Reply-To header when reply key not availableDavid Padilla2016-03-251-0/+15
|
* Explain why ExclusiveLease has no #cancellease-design-commentsJacob Vosmaer2016-03-241-0/+21
| | | | [ci skip]
* Avoid using the same name between methods and variablesLin Jen-Shin2016-03-231-7/+7
|
* Merge branch 'master' into issue_12658Douwe Maan2016-03-212-1/+96
|\ | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
| * Do not rewrite reference if already a cross referenceGrzegorz Bizon2016-03-211-2/+4
| |
| * Find referable for each ref found in references rewriterGrzegorz Bizon2016-03-201-10/+4
| |
| * Rename reference unfolder to rewriter, minor refactoringsGrzegorz Bizon2016-03-201-16/+16
| |
| * Update reference unfolder according to recent ability changesGrzegorz Bizon2016-03-191-2/+3
| | | | | | | | | | Commit 43d8bdb4f048cbeb5675ed9120cb1aeb415b9586 introduced additional checks for permissions to read issue in references extractor.
| * Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-194-4/+70
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (121 commits) Dedupe labels in labels selector in Dashboard pages Refactor colors and lists Add a safeguard in MergeRequest#compute_diverged_commits_count Fix an issue when the target branch of a MR had been deleted Add avatar to issue and MR pages header Cleanup somce css colors Re-group scss variables Refactor `Todo#target` Fixes issue with filter label missing on labels & milestones Rename `Todo#to_reference` to `Todo#target_reference` Fixed failing tests Updated controller with before_action Fixed other issues based on feedback Fixes issue on dashboard issues Full labels data in JSON Fixed issue with labels dropdown getting wrong labels Update CHANGELOG Use `Note#for_project_snippet?` to skip notes on project snippet Use `Commit#short_id` instead of `Commit.truncate_sha` Reuse `for_commit?` on conditional validations Update schema info comment on todo related files ... Conflicts: app/models/issue.rb db/schema.rb spec/models/issue_spec.rb
| * | Improvements in issue move feaure (refactoring)Grzegorz Bizon2016-03-192-19/+16
| | | | | | | | | | | | According to endbosses' suggestions.
| * | Add minor improvements in code related to issue moveGrzegorz Bizon2016-03-171-3/+24
| | |
| * | Add implementation of reference unfolder using banzaiGrzegorz Bizon2016-03-171-5/+48
| | |
| * | Move reference unfolder for GFM to separate classGrzegorz Bizon2016-03-172-1/+38
| | |
* | | Fix specsDouwe Maan2016-03-201-4/+0
| | |
* | | Tweaks, refactoring, and specsDouwe Maan2016-03-201-0/+2
| | |
* | | Merge branch 'master' into issue_12658Douwe Maan2016-03-205-4/+72
|\ \ \ | | |/ | |/|
| * | Merge branch 'confidential-issues' into 'master' Douwe Maan2016-03-182-4/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add confidential issues Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3678 More information: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/227 See merge request !3282
| | * | Restrict access to confidential issues on search resultsDouglas Barbosa Alexandre2016-03-172-4/+6
| | | |
| * | | Show a notice for diffs that are too largehide-large-diffsYorick Peterse2016-03-181-0/+4
| |/ / | | | | | | | | | | | | | | | | | | This builds on the changes introduced in https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results in merge requests with large diffs (e.g. due to them containing minified CSS) loading much faster.
| * | Back-porting PostReceive refactor made for EE 🍺Gabriel Mazetto2016-03-171-0/+60
| |/
| * Return an empty Array when there aren't lines to parse.Rubén Dávila2016-03-151-0/+2
| |
* | Improve group visibility level featureZeger-Jan van de Weg2016-03-181-2/+2
| |
* | Code fixesFelipe Artur2016-03-172-8/+6
| |
* | Merge 4009-external-users into issue_12658Felipe Artur2016-03-1611-30/+184
|\ \ | |/
| * Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""Stan Hu2016-03-121-0/+50
| | | | | | This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5
| * Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-121-50/+0
| | | | | | This reverts merge request !3191
| * Merge branch 'support-go-subpackages' into 'master' Douwe Maan2016-03-121-0/+50
| |\ | | | | | | | | | | | | | | | | | | Support Golang subpackage fetching Closes #13805 See merge request !3191
| | * Ensure PATH_INFO exists for go-getStan Hu2016-03-121-1/+1
| | |
| | * Simplify codeStan Hu2016-03-121-4/+3
| | |
| | * Support Golang subpackage fetchingsupport-go-subpackagesStan Hu2016-03-121-0/+51
| | | | | | | | | | | | Closes #13805
| * | Merge branch 'fix-gh-pr-import' into 'master' Douwe Maan2016-03-122-9/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix importing PR's from GitHub when the source repo was removed Closes #13847 Closes gitlab-com/support-forum#584 See merge request !3172
| | * | Fix importing PR's from GitHub when the source repo was removedDouglas Barbosa Alexandre2016-03-102-9/+12
| | | |
| * | | Merge branch 'rs-issue-12944' into 'master' Douwe Maan2016-03-111-0/+23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a custom Devise failure app to handle unauthenticated .zip requests Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944 See merge request !2828
| | * | | Use a custom Devise failure app to handle unauthenticated .zip requestsrs-issue-12944Robert Speicher2016-03-081-0/+23
| | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
| * | | | Removed order from sub-query projects for searchYorick Peterse2016-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | There's no need to order queries used as sub-queries and doing so can add potential overhead.
| * | | | Added ProjectSearchResults#project_ids_relationYorick Peterse2016-03-111-0/+4
| | | | | | | | | | | | | | | | | | | | This ensures some other methods such as the "issues" method still work.
| * | | | Refactor Gitlab::ProjectSearchResultsYorick Peterse2016-03-111-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this class would be given a project ID which was then used to retrieve the corresponding Project object. However, in all cases the Project object was already known as it was used to grab the ID to pass to ProjectSearchResults. By just passing a Project instead we remove the need for an extra query as well as the need for some other complexity in this class.
| * | | | Refactor Gitlab::SnippetSearchResultsYorick Peterse2016-03-111-5/+5
| | | | | | | | | | | | | | | | | | | | This removes the need for plucking snippet IDs into memory.
| * | | | Refactor Gitlab::SearchResultsYorick Peterse2016-03-111-9/+16
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Instead of plucking IDs this class now uses ActiveRecord::Relation objects. Plucking IDs is problematic as searching for projects can lead to a huge amount of IDs being loaded into memory only to be used as an argument for another query (instead of just using a sub-query).
| * | | web hooks to webhooksashleys2016-03-101-1/+1
| | | |
| * | | Typoexpiring-lockJacob Vosmaer2016-03-101-1/+1
| | | |
| * | | Make comment less ambivalentJacob Vosmaer2016-03-101-2/+1
| | | |
| * | | Remove unnecessary random keyJacob Vosmaer2016-03-101-7/+1
| | | |
| * | | Improve commentJacob Vosmaer2016-03-101-2/+2
| | | |
| * | | Move method to UserJacob Vosmaer2016-03-103-14/+14
| | | |
| * | | Explain LDAP "lock" behaviorJacob Vosmaer2016-03-101-2/+6
| | | |
| * | | Rename ExpiringLock to ExclusiveLeaseJacob Vosmaer2016-03-103-53/+38
| | | |
| * | | Acquire lock before LDAP syncJacob Vosmaer2016-03-093-2/+61
| | |/ | |/|
| * | Always with the newlinesJacob Vosmaer2016-03-091-1/+1
| | |