root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
25,380 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

1554 Commits

Author SHA1 Message Date
Gabriel Mazetto f54bf00309 Back-porting PostReceive refactor made for EE 🍺 2016-03-17 00:24:12 -03:00
Rubén Dávila 7e03b40221 Return an empty Array when there aren't lines to parse. 2016-03-15 19:51:27 -05:00
Stan Hu 74d7de8196 Revert "Revert "Merge branch 'support-go-subpackages' into 'master' "" 
This reverts commit 5a586f364c
 2016-03-12 21:05:23 +00:00
Douwe Maan 5a586f364c Revert "Merge branch 'support-go-subpackages' into 'master' " 
This reverts merge request !3191
 2016-03-12 17:42:51 +00:00
Douwe Maan 826bc72c12 Merge branch 'support-go-subpackages' into 'master' 
Support Golang subpackage fetching

Closes #13805

See merge request !3191
 2016-03-12 17:38:08 +00:00
Stan Hu 380a67ad4c Ensure PATH_INFO exists for go-get 2016-03-12 08:10:54 -08:00
Stan Hu bb206f947f Simplify code 2016-03-12 07:50:02 -08:00
Douwe Maan ff62e20607 Merge branch 'fix-gh-pr-import' into 'master' 
Fix importing PR's from GitHub when the source repo was removed

Closes #13847 
Closes gitlab-com/support-forum#584

See merge request !3172
 2016-03-12 14:07:45 +00:00
Stan Hu cc065fbeaa Support Golang subpackage fetching 
Closes #13805
 2016-03-12 01:09:37 -08:00
Douwe Maan cb81c8a5ef Merge branch 'rs-issue-12944' into 'master' 
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
 2016-03-11 22:34:33 +00:00
Yorick Peterse b77b3b16b6 Removed order from sub-query projects for search 
There's no need to order queries used as sub-queries and doing so can
add potential overhead.
 2016-03-11 15:25:23 -05:00
Yorick Peterse 8c2868e8ea Added ProjectSearchResults#project_ids_relation 
This ensures some other methods such as the "issues" method still work.
 2016-03-11 15:25:23 -05:00
Yorick Peterse ec349dc1b6 Refactor Gitlab::ProjectSearchResults 
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.
 2016-03-11 15:25:22 -05:00
Yorick Peterse 42fde69d39 Refactor Gitlab::SnippetSearchResults 
This removes the need for plucking snippet IDs into memory.
 2016-03-11 15:25:22 -05:00
Yorick Peterse 013542965c Refactor Gitlab::SearchResults 
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).
 2016-03-11 15:25:22 -05:00
Douglas Barbosa Alexandre 37b00b16a5 Fix importing PR's from GitHub when the source repo was removed 2016-03-10 19:29:54 -03:00
ashleys 4cd9a5208c web hooks to webhooks 2016-03-10 14:48:29 -05:00
Jacob Vosmaer 7b2bf4ce75 Typo 2016-03-10 18:41:57 +01:00
Jacob Vosmaer 261214efc2 Make comment less ambivalent 2016-03-10 18:39:50 +01:00
Jacob Vosmaer 3729c0822a Remove unnecessary random key 2016-03-10 17:05:36 +01:00
Jacob Vosmaer 66d5d9229d Improve comment 2016-03-10 12:58:51 +01:00
Jacob Vosmaer e7df3f51c9 Move method to User 2016-03-10 12:37:14 +01:00
Jacob Vosmaer 0223b58f01 Explain LDAP "lock" behavior 2016-03-10 11:05:59 +01:00
Jacob Vosmaer cda0b7e1b1 Rename ExpiringLock to ExclusiveLease 2016-03-10 10:41:16 +01:00
Jacob Vosmaer acd9bc0213 Acquire lock before LDAP sync 2016-03-09 19:11:24 +01:00
Jacob Vosmaer a12319c111 Always with the newlines 2016-03-09 15:56:44 +01:00
Jacob Vosmaer c46e6eff10 Parse config/resque.yml in one place only 2016-03-09 15:16:46 +01:00
Robert Speicher 5844a21a0a Use a custom Devise failure app to handle unauthenticated .zip requests 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
 2016-03-08 23:49:30 -05:00
Iuri de Silvio 591bf92ce7 Fix bug where Bitbucket `closed` issues were imported as `opened` 2016-03-07 19:23:47 +01:00
Jacob Vosmaer 1764e1b7cb Use Gitlab::Git::DiffCollections 2016-03-03 18:38:44 +01:00
Kazuki Sawada fc170baf3f Fix import from gitlab.com 
Fixes #12652
 2016-03-02 10:35:44 +01:00
Patricio Cano bb4fa3a185 Make new `allow_single_sign_on` feature backwards compatible 2016-02-18 17:02:43 -05:00
Patricio Cano 06376be56a Decouple SAML authentication from the default Omniauth logic 2016-02-18 17:01:07 -05:00
Douwe Maan 873b0db220 Revert "Merge branch 'saml-decoupling' into 'master' " 
This reverts commit c04e22fba8, reversing
changes made to 0feab326d5.
 2016-02-18 22:14:53 +01:00
Patricio Cano f014127e17 Decouple SAML authentication from the default Omniauth logic 2016-02-18 13:22:19 -05:00
Jacob Vosmaer 64d8a38b54 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor 2016-02-17 15:25:57 +01:00
Douwe Maan 28d42a33f3 Merge branch 'rs-issue-13469' into 'master' 
Handle nil commits in Gitlab::PushDataBuilder.build

Closes #13469

See merge request !2825
 2016-02-17 14:19:20 +00:00
Jacob Vosmaer a0ccb0731b Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor 2016-02-17 11:30:42 +01:00
Douwe Maan bbbfdba0b9 Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master' 
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
 2016-02-16 13:08:36 +00:00
Robert Speicher 789aef7f26 Handle nil commits in Gitlab::PushDataBuilder.build 
Closes #13469
 2016-02-15 16:06:45 -05:00
Robert Speicher 447568d15f Fix undefined method `postgresql?` during migration 2016-02-15 14:13:47 -05:00
Ben Boeckel e919b5a4e9 Fix relative links in other markup formats 
- 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.
 2016-02-12 17:20:59 +01:00
Rubén Dávila 5a5ee6188b Load all blob data when highlighting content for git-blame. 2016-02-11 18:30:05 -05:00
Jacob Vosmaer 34a6f83d3e Fix API 2016-02-11 18:10:14 +01:00
Kirill Zaitsev b123171d3d Add new data to project in push, issue, merge-request and note webhooks data 
- 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
 2016-02-11 17:22:11 +01:00
Robert Speicher 069937d2c7 Merge branch 'freeze-constants-lib-gitlab-git' into 'master' 
Freeze constants in Gitlab::Git

See merge request !1730
 2016-02-09 18:14:50 +00:00
Douwe Maan ceb342c716 Merge branch 'increase_import_timeout' into 'master' 
Increase project import timeout from 4 minutes to 15 minutes

Many users were experiencing timeouts when we only allowed
4 minutes before a timeout. A 15 minute timeout is more
than reasonable and prevents us from having to add a
configuration for this.

Fixes gitlab-org/gitlab-ee#246

## Import screenshot

![Screen_Shot_2016-02-04_at_1.45.20_PM](/uploads/d9d71ec953afae31e6fbe54a8932b945/Screen_Shot_2016-02-04_at_1.45.20_PM.png)


See merge request !2717
 2016-02-09 10:41:11 +00:00
Valery Sizov e0d7d2e9b4 Merge branch 'snippet_search_refactoring' 2016-02-09 12:04:59 +02:00
Jason Lee e4d276816a Fix CurrentSettings autoload bug in development. 
Error: A copy of Gitlab::CurrentSettings has been removed from the module tree but is still active
 2016-02-08 15:28:48 +01:00
Valery Sizov 8f929b8747 one more improvement to snippet search 2016-02-05 18:27:12 +02:00