summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Typo fixarantir2014-04-271-1/+0
|
* Merge pull request #6868 from cppcho/ConfiureSytse Sijbrandij2014-04-251-1/+1
|\ | | | | Fix typo: Confiure -> Configure
| * Fix typo: Confiure -> ConfigureCho Cheuk Ping2014-04-251-1/+1
| |
* | Merge pull request #6857 from bytheway/masterJacob Vosmaer2014-04-251-1/+2
|\ \ | | | | | | Add scoping to ldap lookup when only dn given
| * | Add scoping to ldap lookup when only dn givenBen Bytheway2014-04-231-1/+2
| | |
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceDmitriy Zaporozhets2014-04-251-5/+5
|\ \ \
| * \ \ Merge branch 'fix-grammar-help-webhooks' into 'master'Sytse Sijbrandij2014-04-241-5/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | Fix grammar and typos in Webhooks help This MR gets rid of some typos and wrong grammar in [help/web_hooks](https://gitlab.com/help/web_hooks).
| | * | Multiple grammar/typo fixes in web hooks helpPhilipp Hansch2014-04-231-5/+5
| |/ /
* | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-251-1/+1
|\ \ \
| * \ \ Merge pull request #6847 from Philzen/patch-2Dmitriy Zaporozhets2014-04-241-1/+1
| |\ \ \ | | | | | | | | | | gitlab.yml description Typo
| | * | | # Fix description TypoPhilzen2014-04-231-1/+1
| | | | |
* | | | | Merge branch 'rake_setup' into 'master'Dmitriy Zaporozhets2014-04-253-2/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rake setup Add alias `rake setup` to `rake gitlab:setup` Mention in developer docs
| * | | | | Add doc file for dev rake tasksDmitriy Zaporozhets2014-04-242-2/+30
| | | | | |
| * | | | | Add rake setup alias for gitlab:setupDmitriy Zaporozhets2014-04-241-0/+4
| |/ / / /
* | | | | Merge branch 'index_on_iid' into 'master'Dmitriy Zaporozhets2014-04-254-0/+37
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add uniq db index on project_id+iid Because: * its faster * it solves problem with repeating iid's in one project
| * | | | Migrate invalid rows with missing iids or duplicatesDmitriy Zaporozhets2014-04-242-0/+26
| | | | |
| * | | | Add iids changelog entryDmitriy Zaporozhets2014-04-241-0/+1
| | | | |
| * | | | Add uniq db index on project_id+iidDmitriy Zaporozhets2014-04-242-0/+10
| | | | |
* | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-241-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge pull request #6843 from evanlucas/bug/6546Dmitriy Zaporozhets2014-04-241-2/+2
| |\ \ \ \ | | | | | | | | | | | | Fix syntax highlighting
| | * | | | Fix syntax highlightingEvan Lucas2014-04-221-2/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | Don't break highlighting on multi-line spans (multi-line comments for example)
* | | | | Merge branch 'mysql_field_limits' into 'master'Dmitriy Zaporozhets2014-04-245-18/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Adjust MySQL limits for existing installations
| * | | | | Move changelog entries to 6.9.0Jacob Vosmaer2014-04-231-2/+4
| | | | | |
| * | | | | Move the adapter check to the migrationJacob Vosmaer2014-04-232-9/+2
| | | | | |
| * | | | | Adjust MySQL limits for existing installationsJacob Vosmaer2014-04-234-9/+14
| | | | | |
* | | | | | Merge branch 'tests_for_fog' into 'master'Dmitriy Zaporozhets2014-04-244-3/+20
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | Tests for fog
| * | | | | Make sure that tests pass when aws group is used.Marin Jankovski2014-04-244-3/+20
|/ / / / /
* | | | | Merge pull request #6848 from hszcg/masterDmitriy Zaporozhets2014-04-241-3/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix diff height
| * | | | Remove fixed height for diff tableChenguang Zhang2014-04-231-3/+0
| | |/ / | |/| |
* | | | Improve ssh_host settingsDmitriy Zaporozhets2014-04-231-2/+2
| | | |
* | | | Fix default ssh_host settingDmitriy Zaporozhets2014-04-231-0/+1
| | | |
* | | | We are at 6.9.0.pre.Marin Jankovski2014-04-231-1/+1
| | | |
* | | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqDmitriy Zaporozhets2014-04-231-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'bump_gitlab_shell' into 'master'Jacob Vosmaer2014-04-231-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Bump gitlab shell
| | * | | | Bump the required gitlab-shell version to 1.9.3Jacob Vosmaer2014-04-231-1/+1
| | | |/ / | | |/| |
* | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceDmitriy Zaporozhets2014-04-234-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'email_in_gravatar_urls' into 'master'Dmitriy Zaporozhets2014-04-232-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow passing user's email address in custom Gravatar urls Some custom avatar systems use the user's email address rather than its hash. This merge request will allow the administrator to configure gitlab-ce to use the user's email address gravatar.plain_url and gravatar.ssl_url in the config file like this: ``` gravatar: enabled: true plain_url: "http://company.com/avatar/?mail=%{email}&size=%{size}" ssl_url: "https://company.com/avatar/?mail=%{email}&size=%{size}" ``` It's a only a 2 word patch.
| | * \ \ \ Merge branch 'email_in_gravatar_urls' of gitlab.com:arnaud/gitlab-ce into ↵Arnaud ABELARD2014-04-120-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | email_in_gravatar_urls
| | | * | | | add mentions of the different placeholders possible for gravatar urls, ↵Arnaud Abélard2014-04-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mentionning the new %{email}
| | | * | | | allow using the user's email address as a http parameter in gravatar urls ↵Arnaud Abélard2014-01-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for custom avatar systems. For example: plain_url: "http://avatar.company.com/avatar/?mail=%{email}&size=%{size}"
| | * | | | | allow using the user's email address as a http parameter in gravatar urls ↵Arnaud ABELARD2014-04-122-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for custom avatar systems. For example: plain_url: "http://avatar.company.com/avatar/?mail=%{email}&size=%{size}" add mention of the different placeholders possible for gravatar urls, mentionning the new %{email}
| * | | | | | Merge branch 'bug-to-ldap-configuration' into 'master'Dmitriy Zaporozhets2014-04-231-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LDAP Configuration Fix This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/180 in new installations of version 6.8 (installations upgraded from 6.7 still have the issue, however).
| | * | | | | | Actually use the 'user_filter' configuration optionTravis Odom2014-04-211-1/+2
| | | | | | | |
| * | | | | | | Merge branch 'render_docs' into 'master'Dmitriy Zaporozhets2014-04-231-0/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix code block that doesn't render correctly in doc.gitlab.com Probably fixes https://gitlab.com/gitlab-com/doc-gitlab-com/issues/6
| | * | | | | | Newline between sentence and code blockAchilleas Pipinellis2014-04-221-0/+2
| |/ / / / / /
* | | | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-239-62/+155
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #6795 from cirosantilli/markdown-styleguideDmitriy Zaporozhets2014-04-231-6/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | Add markdown styleguide.
| | * | | | | Add markdown styleguide.Ciro Santilli2014-04-211-6/+7
| | | | | | |
| * | | | | | Merge pull request #6827 from demisx/masterDmitriy Zaporozhets2014-04-232-1/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add ability to set different ssh host, if different from http/https
| | * | | | | | Add ability to set different ssh host, if different from http/httpsDmitri Moore2014-04-182-1/+6
| | | | | | | |
View Lorry Controller Status