summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.emailsonpush-hellipDouwe Maan2015-04-143-3/+4
* Merge branch 'dir-traversal' into 'master'Dmitriy Zaporozhets2015-04-143-5/+38
|\
| * Add explanation to HelpController#clean_path_info.Douwe Maan2015-04-141-3/+16
| * Fix a whoopsie daisy in the changelog.Douwe Maan2015-04-111-1/+0
| * Fix directory traversal vulnerability around help pages.Douwe Maan2015-04-102-1/+20
| * Fix directory traversal vulnerability around uploads routes.Douwe Maan2015-04-102-4/+6
* | Merge pull request #9126 from Senorsen/masterDmitriy Zaporozhets2015-04-149-5/+37
|\ \
| * | Allow user to choose which email to be publicSenorsen2015-04-149-5/+37
|/ /
* | Revert "Merge branch 'fix-stuck-mr' into 'master'"Douwe Maan2015-04-142-2/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-1420-137/+22
|\ \
| * \ Merge branch 'revert_fix_email_images' into 'master'Douwe Maan2015-04-145-107/+6
| |\ \
| | * | Revert "Merge branch 'fix_email_images' into 'master'"Hannes Rosenögger2015-04-135-107/+6
| * | | Merge branch 'fix_changelog' into 'master'Douwe Maan2015-04-141-2/+3
| |\ \ \
| | * | | Remove superseeded changelog entry for commit calendarRobert Schilling2015-04-131-1/+0
| | * | | Fix wrong merged changelog entriesRobert Schilling2015-04-131-4/+3
| * | | | Merge branch 'fix-stuck-mr' into 'master'Douwe Maan2015-04-142-1/+2
| |\ \ \ \
| | * | | | fix stuck MRBen Bodenmiller2015-04-142-1/+2
| | |/ / /
| * | | | Merge branch 'fix_tests_help_link_2' into 'master'Hannes Rosenögger2015-04-132-0/+7
| |\ \ \ \
| | * | | | fix failing testHannes Rosenögger2015-04-132-0/+7
| |/ / / /
| * | | | Merge branch 'fix_tests_help_link' into 'master'Douwe Maan2015-04-133-19/+0
| |\ \ \ \
| | * | | | The help link has been removed. The commit removes the test for it.Hannes Rosenögger2015-04-133-19/+0
| |/ / / /
| * | | | Merge branch 'empty-avatar-alt-text' into 'master'Hannes Rosenögger2015-04-139-9/+10
| |\ \ \ \
| | * | | | Explicitly set image alt to prevent graphical glitchesSven Strickroth2015-04-139-9/+10
| * | | | | Merge branch 'remove-sidebar-help-link' into 'master'Hannes Rosenögger2015-04-131-5/+0
| |\ \ \ \ \
| | * | | | | Removed help link from sidebarPhil Hughes2015-03-311-5/+0
| * | | | | | Merge branch 'master' into 'master'Hannes Rosenögger2015-04-131-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | gitlab 7.9.2Igor Kostenko2015-04-071-1/+1
| | | |/ / / | | |/| | |
* | | | | | Merge branch 'rs-remove-invalid-key-factories' into 'master'Dmitriy Zaporozhets2015-04-143-22/+9
|\ \ \ \ \ \
| * | | | | | Remove the invalid key factoriesRobert Speicher2015-04-113-22/+9
* | | | | | | Merge branch 'rs-link-to-performance' into 'master'Dmitriy Zaporozhets2015-04-142-32/+38
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Use `start_with?` instead of String slicing to check for external linksRobert Speicher2015-04-121-1/+1
| * | | | | | Speed up the overridden `link_to` helperRobert Speicher2015-04-122-32/+38
* | | | | | | Merge branch 'ldap_migration'Dmitriy Zaporozhets2015-04-138-20/+48
|\ \ \ \ \ \ \
| * | | | | | | Call your existing LDAP server 'main'Jacob Vosmaer2015-04-132-4/+9
| * | | | | | | Remove test for 'ldap' provider special caseJacob Vosmaer2015-04-131-14/+0
| * | | | | | | Also ldap_group_links where provider='ldap'Jacob Vosmaer2015-04-131-1/+1
| * | | | | | | Merge branch 'ldap_migration' of dev.gitlab.org:gitlab/gitlabhq into ldap_mig...Jacob Vosmaer2015-04-131-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Check for table instead of classDmitriy Zaporozhets2015-04-131-2/+2
| * | | | | | | | Simplify legacy LDAP config interpretationJacob Vosmaer2015-04-131-2/+3
| * | | | | | | | Make migration work if LDAP is disabledJacob Vosmaer2015-04-131-2/+7
| |/ / / / / / /
| * | | | | | | Try to explain what we are doingJacob Vosmaer2015-04-131-0/+9
| * | | | | | | Remove special cases for the 'ldap' providerJacob Vosmaer2015-04-132-3/+1
| * | | | | | | Change migration to SQLDmitriy Zaporozhets2015-04-131-4/+6
| * | | | | | | fix ldap identitiesValery Sizov2015-04-114-4/+26
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'reference-access-control' into 'master'Dmitriy Zaporozhets2015-04-1322-257/+277
|\ \ \ \ \ \ \
| * | | | | | | Update tests.Douwe Maan2015-04-032-48/+54
| * | | | | | | Refactor ClosingIssueExtractor.Douwe Maan2015-04-033-15/+14
| * | | | | | | Refactor ReferenceExtractor.Douwe Maan2015-04-031-29/+28
| * | | | | | | Don't require user to every gfm call.Douwe Maan2015-04-032-22/+22
| * | | | | | | Allow byebug to be used in test.Douwe Maan2015-04-031-1/+2