summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improve instructions for publishing gitlab-app.Sytse Sijbrandij2015-06-051-3/+5
* Merge branch 'warn-about-referenced-users' into 'master'Dmitriy Zaporozhets2015-06-0521-60/+133
|\
| * Prefer jQuery on to bind, and don't use .js class.warn-about-referenced-usersDouwe Maan2015-06-054-8/+8
| * Show warning when a comment will add 10 or more people to the discussion.Douwe Maan2015-06-0521-59/+132
* | Merge branch 'wip-mr-docs' into 'master'Dmitriy Zaporozhets2015-06-056-3/+17
|\ \
| * | Add info about WIP merge requests to docs.wip-mr-docsDouwe Maan2015-06-056-3/+17
| |/
* | Merge branch 'fix-long-blob-timeout' into 'master'Dmitriy Zaporozhets2015-06-052-1/+3
|\ \
| * | Fix timeout when rendering file with thousands of lines.fix-long-blob-timeoutDouwe Maan2015-06-052-1/+3
|/ /
* | Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'Douwe Maan2015-06-055-15/+221
|\ \
| * | Tweak code.cernvcs/gitlab-ce-feature/auto_link_ldap_omniauthDouwe Maan2015-06-051-21/+24
| * | Add option to automatically link omniauth and LDAP identitiesAlex Lossent2015-06-035-16/+219
* | | Merge branch 'fix-empty-navbar' into 'master'Dmitriy Zaporozhets2015-06-052-1/+6
|\ \ \ | |_|/ |/| |
| * | Fix empty headerDmitriy Zaporozhets2015-06-052-1/+6
* | | Merge branch 'improve_bitbucket_docs' into 'master'Douwe Maan2015-06-051-18/+36
|\ \ \ | |/ / |/| |
| * | Improve BitBucket integration documentation [ci skip]Patrick Fey2015-05-151-18/+36
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-053-2/+4
|\ \ \
| * \ \ Merge branch 'maser/gitlab-ce-order-commit-comments-in-api' into 'master'Dmitriy Zaporozhets2015-06-053-2/+4
| |\ \ \
| | * | | Order commit comments in API chronologicallyMartin Luder2015-05-083-2/+4
* | | | | Merge branch 'ci_script_simplify1' into 'master'Dmitriy Zaporozhets2015-06-051-10/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | CI script: remove directives with default valueValery Sizov2015-06-041-10/+0
|/ / / /
* | | | Merge branch 'rs-remove-guard' into 'master'Dmitriy Zaporozhets2015-06-046-85/+0
|\ \ \ \
| * | | | Remove unnecessary require from Spinach envRobert Speicher2015-06-041-1/+0
| * | | | Remove unnecessary require from RepositoryCache specRobert Speicher2015-06-041-1/+0
| * | | | Remove GuardRobert Speicher2015-06-034-83/+0
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-043-3/+24
|\ \ \ \ \
| * \ \ \ \ Merge branch 'fix-upgrader-script' into 'master'Dmitriy Zaporozhets2015-06-043-3/+24
| |\ \ \ \ \
| | * | | | | Update mocking/stubbing syntax to the new RSpec 3 syntaxMartins Polakovs2015-05-301-1/+1
| | * | | | | Fix upgrader scriptMartins Polakovs2015-05-233-3/+24
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-049-8/+94
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'make-namespaces-api-available-to-all-users' into 'master'Dmitriy Zaporozhets2015-06-047-6/+88
| |\ \ \ \ \ \
| | * | | | | | Make namespace API available to all usersStan Hu2015-05-287-6/+88
| * | | | | | | Merge branch 'sn-push-email-plussign' into 'master'Dmitriy Zaporozhets2015-06-041-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Use entity number for plus signSteve Norman2015-05-271-1/+1
| * | | | | | | | Merge branch 'fix-no-labels-page' into 'master'Dmitriy Zaporozhets2015-06-042-1/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Omit link to generate labels if user does not have access to create themStan Hu2015-06-012-1/+5
* | | | | | | | | | Merge branch 'refacor-ci-script' into 'master'Dmitriy Zaporozhets2015-06-041-48/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Refactor CI scriptDmitriy Zaporozhets2015-06-041-48/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-042-1/+5
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'trigger_hooks_create_on_backup_restore' into 'master'Dmitriy Zaporozhets2015-06-042-1/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add a changelog item.trigger_hooks_create_on_backup_restoreMarin Jankovski2015-06-031-1/+2
| | * | | | | | | | | Trigger hooks-create on gitlab backup restore.Marin Jankovski2015-06-031-0/+3
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-0417-94/+87
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'rs-issue-1741' into 'master'Dmitriy Zaporozhets2015-06-0413-93/+20
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | Show key fingerprint on DeployKeys#indexrs-issue-1741Robert Speicher2015-06-035-15/+16
| | * | | | | | | | | Remove show actions from Admin and Project DeployKeysRobert Speicher2015-06-038-78/+4
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'rs-2fa-docs' into 'master'Job van der Voort2015-06-034-1/+67
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fix typo and add screenshotsJob van der Voort2015-06-033-3/+3
| | * | | | | | | | | Add 2FA docsrs-2fa-docsRobert Speicher2015-06-022-1/+67
* | | | | | | | | | | Merge branch 'add_ci_yaml' into 'master'Dmitriy Zaporozhets2015-06-041-0/+94
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | added ci yamlValery Sizov2015-06-041-0/+94
|/ / / / / / / / / /
View Lorry Controller Status