summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'google-code-import-performance' into 'master'Dmitriy Zaporozhets2015-04-172-69/+55
|\
| * Decrease memory use and increase performance of Google Code importer.Douwe Maan2015-04-171-47/+38
| * Move import data out of project so it doesn't take ages to load.Douwe Maan2015-04-172-22/+17
* | Add new rake taskVinnie Okada2015-04-151-0/+17
|/
* Make sure user has access to namespace in import tests.Douwe Maan2015-04-152-32/+37
* Merge branch 'sstanovnik-openssh_fix' into 'master'Dmitriy Zaporozhets2015-04-151-0/+55
|\
| * Simplify regex.sstanovnik-openssh_fixDouwe Maan2015-04-141-3/+3
| * Refactor key fingerprint generation.Douwe Maan2015-04-141-0/+55
* | Merge branch 'ldap-block_auto_created_users' into 'master'Dmitriy Zaporozhets2015-04-152-2/+12
|\ \
| * | Add config var to block auto-created LDAP users.Douwe Maan2015-04-142-2/+10
| * | Non-persisted users already have the identity by way of build_new_user.Douwe Maan2015-04-141-0/+2
* | | Merge branch 'invitation' into 'master'Dmitriy Zaporozhets2015-04-152-7/+6
|\ \ \
| * | | Track who created a group or project member.Douwe Maan2015-04-141-1/+1
| * | | Use through-relation instead of manually mapping.Douwe Maan2015-04-141-2/+1
| * | | Rename manage_group ability to admin_group for consistency with project.Douwe Maan2015-04-142-4/+4
| |/ /
* | | Merge branch 'google-code-import' into 'master'Douwe Maan2015-04-154-0/+502
|\ \ \ | |/ / |/| |
| * | Import Google Code issue assignee when mapped.google-code-importDouwe Maan2015-04-141-0/+14
| * | Skip issue comment when its content, updates and attachments are empty.Douwe Maan2015-04-141-39/+61
| * | Allow user map to be specified.Douwe Maan2015-04-144-17/+56
| * | Add comment number to imported Google Code comments.Douwe Maan2015-04-141-3/+3
| * | Remove author link since all code.google.com links will be shut down.Douwe Maan2015-04-141-8/+6
| * | Show Google Code image attachments inline.Douwe Maan2015-04-041-2/+6
| * | Mask owner email when updated.Douwe Maan2015-04-031-14/+10
| * | Allow projects to be imported from Google Code.Douwe Maan2015-04-034-0/+429
* | | Merge branch 'ldap_migration'Dmitriy Zaporozhets2015-04-132-3/+1
|\ \ \
| * | | Remove special cases for the 'ldap' providerJacob Vosmaer2015-04-132-3/+1
* | | | Merge branch 'reference-access-control' into 'master'Dmitriy Zaporozhets2015-04-133-65/+66
|\ \ \ \
| * | | | Refactor ClosingIssueExtractor.Douwe Maan2015-04-031-12/+11
| * | | | Refactor ReferenceExtractor.Douwe Maan2015-04-031-29/+28
| * | | | Don't require user to every gfm call.Douwe Maan2015-04-031-21/+21
| * | | | Fix errors.Douwe Maan2015-04-022-20/+8
| * | | | Only allow users to cross-reference and close issues they have access to.Douwe Maan2015-04-021-2/+2
| * | | | Don't allow full access to guests in ReferenceExtractorDouwe Maan2015-04-021-3/+0
| * | | | Refactor Mentionable mentioned users to use ReferenceExtractor.Douwe Maan2015-04-021-2/+10
| * | | | Only allow user to reference objects they have access to.Douwe Maan2015-04-022-21/+31
| * | | | Slightly refactor ReferenceExtractor.Douwe Maan2015-04-022-38/+38
* | | | | Merge branch 'skip-email-reconfirmation' into 'master'Dmitriy Zaporozhets2015-04-131-0/+1
|\ \ \ \ \
| * | | | | Skip email confirmation when set by admin or via LDAP.skip-email-reconfirmationDouwe Maan2015-04-061-0/+1
* | | | | | Merge branch 'shell-version-warning' into 'master'Dmitriy Zaporozhets2015-04-131-1/+1
|\ \ \ \ \ \
| * | | | | | Warn when gitlab-shell version doesn't match requirement.shell-version-warningDouwe Maan2015-04-061-1/+1
| |/ / / / /
* | | | | | Merge pull request #9114 from dreis2211/dreis2211-patch-1Dmitriy Zaporozhets2015-04-101-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Include creator_id in project info of APIChristoph Dreis2015-04-101-0/+1
* | | | | | Merge branch 'rs-revert-preload-lib' into 'master'Dmitriy Zaporozhets2015-04-106-1/+11
|\ \ \ \ \ \
| * | | | | | Move lib/gitlab/contributors to its correct pathRobert Speicher2015-04-091-0/+0
| * | | | | | Add autoloads for lib/gitlab/satellite/files/*Robert Speicher2015-04-091-0/+5
| * | | | | | Add lib/gitlab.rb to autoload non-conventional pathsRobert Speicher2015-04-091-0/+5
| * | | | | | Move lib/gitlab/oauth to lib/gitlab/o_authRobert Speicher2015-04-093-1/+1
| |/ / / / /
* | | | | | Be more explicit about which "Markdown" ReferenceExtractor includesRobert Speicher2015-04-091-1/+1
|/ / / / /
* | | | | Use Projects::CreateService to create imported projects so hooks are executed.Douwe Maan2015-04-064-64/+12
|/ / / /
* | | | Merge branch 'feature_expose_project_labels' into 'master'Hannes Rosenögger2015-04-031-1/+1
|\ \ \ \ | |_|/ / |/| | |
View Lorry Controller Status