summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-151-1/+1
|\
| * Merge pull request #9039 from gemnasium/update-gemnasium-gitlab-service-to-0-2-6Dmitriy Zaporozhets2015-04-151-1/+1
| |\
| | * Update gemnasium-gitlab-service to 0.2.6fabien2015-03-271-1/+1
* | | Merge branch 'search-information-leak' into 'master'Dmitriy Zaporozhets2015-04-152-5/+19
|\ \ \ | |/ / |/| |
| * | Fix a whoopsie daisy in the changelog.Douwe Maan2015-04-111-1/+0
| * | Don't leak existence of group or project via search.Douwe Maan2015-04-102-4/+12
| * | Don't leak existence of project via search autocomplete.Douwe Maan2015-04-102-1/+8
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-1525-19/+1387
|\ \ \
| * \ \ Merge branch 'fix-stuck-mr' into 'master'Douwe Maan2015-04-152-1/+4
| |\ \ \
| | * | | fix stuck mrBen Bodenmiller2015-04-142-1/+4
| * | | | Merge branch 'google-code-import' into 'master'Douwe Maan2015-04-1522-16/+1382
| |\ \ \ \
| | * | | | Import Google Code issue assignee when mapped.google-code-importDouwe Maan2015-04-143-3/+26
| | * | | | Skip issue comment when its content, updates and attachments are empty.Douwe Maan2015-04-141-39/+61
| | * | | | "interpunction" -> "punctuation"Douwe Maan2015-04-141-1/+1
| | * | | | Move Specify user map button to paragraph.Douwe Maan2015-04-141-1/+4
| | * | | | Allow user map to be specified.Douwe Maan2015-04-1410-23/+150
| | * | | | Add comment number to imported Google Code comments.Douwe Maan2015-04-142-3/+4
| | * | | | Remove author link since all code.google.com links will be shut down.Douwe Maan2015-04-142-10/+6
| | * | | | Show Google Code image attachments inline.Douwe Maan2015-04-043-3/+13
| | * | | | Fix tests.Douwe Maan2015-04-032-4/+2
| | * | | | Mask owner email when updated.Douwe Maan2015-04-031-14/+10
| | * | | | Add instructions to Google Code import page.Douwe Maan2015-04-032-13/+47
| | * | | | Allow projects to be imported from Google Code.Douwe Maan2015-04-0321-14/+1170
| * | | | | Merge branch 'fix-spinach-unsubscribe-mr-test' into 'master'Robert Schilling2015-04-151-2/+1
| |\ \ \ \ \
| | * | | | | Remove timing dependency on testStan Hu2015-04-141-2/+1
| |/ / / / /
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-152-4/+5
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #8905 from jasonblanchard/remove-truncation-milestoneDmitriy Zaporozhets2015-04-152-4/+5
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Remove truncation from issue titles on milestone pageJason Blanchard2015-04-142-4/+5
* | | | | | | Merge branch 'revert-help-link' into 'master'Dmitriy Zaporozhets2015-04-154-0/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Revert help link tests removalDmitriy Zaporozhets2015-04-153-0/+12
| * | | | | | Revert "Removed help link from sidebar"Dmitriy Zaporozhets2015-04-151-0/+5
|/ / / / / /
* | | | | | Merge branch 'fix-ldap-migration' into 'master'Dmitriy Zaporozhets2015-04-141-3/+16
|\ \ \ \ \ \
| * | | | | | Remove unnecessary semicolonsJacob Vosmaer2015-04-141-2/+2
| * | | | | | Use different queries for MySQL and PostgresJacob Vosmaer2015-04-141-1/+14
| |/ / / / /
* | | | | | Use smae background for git clone text and project visibilityDmitriy Zaporozhets2015-04-141-0/+4
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-141-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 'master'Douwe Maan2015-04-141-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix error messageZbigniew Motyka2015-04-141-1/+1
* | | | | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-04-145-20/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Default buttons should look the same on project pageDmitriy Zaporozhets2015-04-141-7/+4
| * | | | | | Align project download button with others in sidebar on project home pageDmitriy Zaporozhets2015-04-143-8/+12
| * | | | | | Add border radius and shadow to project avatar on project home pageDmitriy Zaporozhets2015-04-141-0/+5
| * | | | | | Fix button overflow for branches/tags pagesDmitriy Zaporozhets2015-04-142-5/+5
|/ / / / / /
* | | | | | 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
|/ / / / / /