Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't use HTML ellipsis in EmailsOnPush subject truncated commit message.emailsonpush-hellip | Douwe Maan | 2015-04-14 | 3 | -3/+4 |
* | Merge branch 'dir-traversal' into 'master' | Dmitriy Zaporozhets | 2015-04-14 | 3 | -5/+38 |
|\ | |||||
| * | Add explanation to HelpController#clean_path_info. | Douwe Maan | 2015-04-14 | 1 | -3/+16 |
| * | Fix a whoopsie daisy in the changelog. | Douwe Maan | 2015-04-11 | 1 | -1/+0 |
| * | Fix directory traversal vulnerability around help pages. | Douwe Maan | 2015-04-10 | 2 | -1/+20 |
| * | Fix directory traversal vulnerability around uploads routes. | Douwe Maan | 2015-04-10 | 2 | -4/+6 |
* | | Merge pull request #9126 from Senorsen/master | Dmitriy Zaporozhets | 2015-04-14 | 9 | -5/+37 |
|\ \ | |||||
| * | | Allow user to choose which email to be public | Senorsen | 2015-04-14 | 9 | -5/+37 |
|/ / | |||||
* | | Revert "Merge branch 'fix-stuck-mr' into 'master'" | Douwe Maan | 2015-04-14 | 2 | -2/+1 |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-04-14 | 20 | -137/+22 |
|\ \ | |||||
| * \ | Merge branch 'revert_fix_email_images' into 'master' | Douwe Maan | 2015-04-14 | 5 | -107/+6 |
| |\ \ | |||||
| | * | | Revert "Merge branch 'fix_email_images' into 'master'" | Hannes Rosenögger | 2015-04-13 | 5 | -107/+6 |
| * | | | Merge branch 'fix_changelog' into 'master' | Douwe Maan | 2015-04-14 | 1 | -2/+3 |
| |\ \ \ | |||||
| | * | | | Remove superseeded changelog entry for commit calendar | Robert Schilling | 2015-04-13 | 1 | -1/+0 |
| | * | | | Fix wrong merged changelog entries | Robert Schilling | 2015-04-13 | 1 | -4/+3 |
| * | | | | Merge branch 'fix-stuck-mr' into 'master' | Douwe Maan | 2015-04-14 | 2 | -1/+2 |
| |\ \ \ \ | |||||
| | * | | | | fix stuck MR | Ben Bodenmiller | 2015-04-14 | 2 | -1/+2 |
| | |/ / / | |||||
| * | | | | Merge branch 'fix_tests_help_link_2' into 'master' | Hannes Rosenögger | 2015-04-13 | 2 | -0/+7 |
| |\ \ \ \ | |||||
| | * | | | | fix failing test | Hannes Rosenögger | 2015-04-13 | 2 | -0/+7 |
| |/ / / / | |||||
| * | | | | Merge branch 'fix_tests_help_link' into 'master' | Douwe Maan | 2015-04-13 | 3 | -19/+0 |
| |\ \ \ \ | |||||
| | * | | | | The help link has been removed. The commit removes the test for it. | Hannes Rosenögger | 2015-04-13 | 3 | -19/+0 |
| |/ / / / | |||||
| * | | | | Merge branch 'empty-avatar-alt-text' into 'master' | Hannes Rosenögger | 2015-04-13 | 9 | -9/+10 |
| |\ \ \ \ | |||||
| | * | | | | Explicitly set image alt to prevent graphical glitches | Sven Strickroth | 2015-04-13 | 9 | -9/+10 |
| * | | | | | Merge branch 'remove-sidebar-help-link' into 'master' | Hannes Rosenögger | 2015-04-13 | 1 | -5/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | Removed help link from sidebar | Phil Hughes | 2015-03-31 | 1 | -5/+0 |
| * | | | | | | Merge branch 'master' into 'master' | Hannes Rosenögger | 2015-04-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | gitlab 7.9.2 | Igor Kostenko | 2015-04-07 | 1 | -1/+1 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | Merge branch 'rs-remove-invalid-key-factories' into 'master' | Dmitriy Zaporozhets | 2015-04-14 | 3 | -22/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove the invalid key factories | Robert Speicher | 2015-04-11 | 3 | -22/+9 |
* | | | | | | | Merge branch 'rs-link-to-performance' into 'master' | Dmitriy Zaporozhets | 2015-04-14 | 2 | -32/+38 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Use `start_with?` instead of String slicing to check for external links | Robert Speicher | 2015-04-12 | 1 | -1/+1 |
| * | | | | | | Speed up the overridden `link_to` helper | Robert Speicher | 2015-04-12 | 2 | -32/+38 |
* | | | | | | | Merge branch 'ldap_migration' | Dmitriy Zaporozhets | 2015-04-13 | 8 | -20/+48 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Call your existing LDAP server 'main' | Jacob Vosmaer | 2015-04-13 | 2 | -4/+9 |
| * | | | | | | | Remove test for 'ldap' provider special case | Jacob Vosmaer | 2015-04-13 | 1 | -14/+0 |
| * | | | | | | | Also ldap_group_links where provider='ldap' | Jacob Vosmaer | 2015-04-13 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'ldap_migration' of dev.gitlab.org:gitlab/gitlabhq into ldap_mig... | Jacob Vosmaer | 2015-04-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Check for table instead of class | Dmitriy Zaporozhets | 2015-04-13 | 1 | -2/+2 |
| * | | | | | | | | Simplify legacy LDAP config interpretation | Jacob Vosmaer | 2015-04-13 | 1 | -2/+3 |
| * | | | | | | | | Make migration work if LDAP is disabled | Jacob Vosmaer | 2015-04-13 | 1 | -2/+7 |
| |/ / / / / / / | |||||
| * | | | | | | | Try to explain what we are doing | Jacob Vosmaer | 2015-04-13 | 1 | -0/+9 |
| * | | | | | | | Remove special cases for the 'ldap' provider | Jacob Vosmaer | 2015-04-13 | 2 | -3/+1 |
| * | | | | | | | Change migration to SQL | Dmitriy Zaporozhets | 2015-04-13 | 1 | -4/+6 |
| * | | | | | | | fix ldap identities | Valery Sizov | 2015-04-11 | 4 | -4/+26 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'reference-access-control' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 22 | -257/+277 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update tests. | Douwe Maan | 2015-04-03 | 2 | -48/+54 |
| * | | | | | | | Refactor ClosingIssueExtractor. | Douwe Maan | 2015-04-03 | 3 | -15/+14 |
| * | | | | | | | Refactor ReferenceExtractor. | Douwe Maan | 2015-04-03 | 1 | -29/+28 |
| * | | | | | | | Don't require user to every gfm call. | Douwe Maan | 2015-04-03 | 2 | -22/+22 |
| * | | | | | | | Allow byebug to be used in test. | Douwe Maan | 2015-04-03 | 1 | -1/+2 |