summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | Modified lib/api/entities.rb to expose Project class tag_list property to the...Cristian Medina2015-04-031-1/+1
* | | Merge branch 'configurable-attachment-size' into 'master'Douwe Maan2015-04-032-3/+12
|\ \ \ | |/ / |/| |
| * | Support configurable attachment size via Application SettingsStan Hu2015-04-022-3/+12
| |/
* | Merge branch 'import-current-user' into 'master'Dmitriy Zaporozhets2015-04-021-0/+4
|\ \
| * | Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user i...Douwe Maan2015-03-311-0/+4
* | | Merge branch 'repository-archive-worker' into 'master'Dmitriy Zaporozhets2015-04-021-5/+6
|\ \ \
| * | | Archive repositories in background worker.Douwe Maan2015-03-311-5/+6
| |/ /
* | | Merge branch 'username-period' into 'master'Dmitriy Zaporozhets2015-04-023-32/+38
|\ \ \
| * | | Don't allow username to end in period.Douwe Maan2015-03-272-3/+5
| * | | Use more specific regexes.Douwe Maan2015-03-271-30/+34
| * | | Move User.cleanup_username to Namespace.cleanup_path.Douwe Maan2015-03-271-1/+1
* | | | ability to skip some items in backupbackup_skip_optionValery Sizov2015-04-022-15/+60
| |_|/ |/| |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2015-03-311-1/+1
|\ \ \
| * \ \ Merge branch 'no-chmod-r' into 'master'Dmitriy Zaporozhets2015-04-011-1/+1
| |\ \ \
| | * | | Don't use chmod_R for backup tarsVinnie Okada2015-03-281-1/+1
| | |/ /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-312-16/+16
|\ \ \ \
| * \ \ \ Merge branch 'group-information-leak' into 'master'Dmitriy Zaporozhets2015-04-011-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Don't leak private group existence by redirecting from namespace controller t...Douwe Maan2015-03-241-1/+1
| * | | | Merge pull request #9023 from dantudor/patch-1Dmitriy Zaporozhets2015-03-311-3/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Added the missing commaDan Tudor2015-03-311-1/+1
| | * | | Allow ability to delete branches with '/` in nameDan Tudor2015-03-251-3/+3
* | | | | Merge branch 'email-full-url'Marin Jankovski2015-03-311-37/+53
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use relative URL for Markdown references, except in mails.email-full-urlDouwe Maan2015-03-271-37/+53
| | |_|/ | |/| |
* | | | Merge branch 'events-paginate' into 'master'Douwe Maan2015-03-301-1/+1
|\ \ \ \