summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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
| |
* | Parse config/resque.yml in one place onlyJacob Vosmaer2016-03-091-0/+30
| |
* | Fix bug where Bitbucket `closed` issues were imported as `opened`iurisilvio/gitlab-ce-bitbucket_closedIuri de Silvio2016-03-071-1/+1
|/
* Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-034-50/+42
|
* Fix import from gitlab.comKazuki Sawada2016-03-021-1/+1
| | | | Fixes #12652
* Make new `allow_single_sign_on` feature backwards compatiblePatricio Cano2016-02-181-1/+5
|
* Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-183-4/+56
|
* Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-183-56/+4
| | | | | This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
* Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-183-4/+56
|
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵git-archive-refactorJacob Vosmaer2016-02-171-0/+2
|\ | | | | | | git-archive-refactor
| * Merge branch 'rs-issue-13469' into 'master' Douwe Maan2016-02-171-0/+2
| |\ | | | | | | | | | | | | | | | | | | Handle nil commits in Gitlab::PushDataBuilder.build Closes #13469 See merge request !2825
| | * Handle nil commits in Gitlab::PushDataBuilder.buildrs-issue-13469Robert Speicher2016-02-151-0/+2
| | | | | | | | | | | | Closes #13469
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-1713-47/+122
|\ \ \ | |/ / | | | | | | git-archive-refactor
| * | Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' Douwe Maan2016-02-162-17/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new data to project in push, issue, merge-request and note webhooks data _Originally opened at !2738 by @bugagazavr._ - - - **What does this MR do?** Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks ) **Are there points in the code the reviewer needs to double check?** 1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738 2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132 3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52 4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56 **Why was this MR needed?** More information about user for push events, and more data about repositiry ( project ) **What are the relevant issue numbers?** No **Screenshots (if relevant)** No See merge request !2788
| | * | Add new data to project in push, issue, merge-request and note webhooks databugagazavr/gitlab-ce-extend-hooksKirill Zaitsev2016-02-112-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`, `path_with_namespace` and `default_branch` in `project` in push, issue, merge-request and note webhooks data - Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in favor of `git_http_url` in `project` for push, issue, merge-request and note webhooks data - Deprecate the `repository` key in push, issue, merge-request and note webhooks data, use `project` instead
| * | | Fix undefined method `postgresql?` during migrationrs-gitlab-database-moduleRobert Speicher2016-02-151-6/+2
| | |/ | |/|
| * | Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docsBen Boeckel2016-02-122-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | - Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533.
| * | Load all blob data when highlighting content for git-blame.Rubén Dávila2016-02-111-0/+1
| |/
| * Merge branch 'freeze-constants-lib-gitlab-git' into 'master' Robert Speicher2016-02-091-3/+3
| |\ | | | | | | | | | | | | Freeze constants in Gitlab::Git See merge request !1730
| | * Freeze the expression instead of the literalZeger-Jan van de Weg2016-02-051-2/+1
| | | | | | | | | | | | Also remove the spec for it
| | * Minor refactoring on Gitlab::GitZeger-Jan van de Weg2016-02-051-3/+4
| | |
View Lorry Controller Status