summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix specs caused by update of gitlab-test repo.serve_lfs_objectMarin Jankovski2015-12-083-2/+4
* Rename blob helper, bump version of gitlab_git to 7.2.21.Marin Jankovski2015-12-074-7/+7
* Add specs for showing lfs object in UI.Marin Jankovski2015-12-0713-21/+111
* Recursivity needed if a fork is a fork of a fork.Marin Jankovski2015-12-042-2/+2
* Don't show diffs for lfs pointers.Marin Jankovski2015-12-042-4/+2
* Move the file serving to Raw controller, add a few ifs to view.Marin Jankovski2015-12-035-30/+36
* If a user clicks on the LFS object, it should be served if the user has acces...Marin Jankovski2015-12-032-0/+27
* Merge branch 'fix_master' into 'master' Valery Sizov2015-12-032-2/+2
|\
| * Fix failures in masterValery Sizov2015-12-032-2/+2
* | Merge branch 'deprecated_warnings' into 'master' Dmitriy Zaporozhets2015-12-038-29/+21
|\ \ | |/ |/|
| * Rails deprecation warning about log_levelValery Sizov2015-12-031-1/+1
| * fix Celluloid warningsValery Sizov2015-12-031-18/+3
| * fix deprecation messages in testsValery Sizov2015-12-036-10/+12
| * git rid of deprecated warningsdeprecated_warningsValery Sizov2015-12-021-0/+5
* | Merge branch 'test_fix' into 'master' Valery Sizov2015-12-031-1/+3
|\ \
| * | Fix broken spec related to MySQL and fractional seconds support.Rubén Dávila2015-12-031-1/+3
|/ /
* | Merge branch 'ui/consistency' into 'master' Dmitriy Zaporozhets2015-12-0232-49/+68
|\ \
| * | Brefer "Directory" over "Dir", "Files" over "Codeui/consistencyDouwe Maan2015-12-023-8/+9
| * | Use file-type specific file icon in blame view and diff itemDouwe Maan2015-12-022-8/+15
| * | Use monospace font for commit SHA in branch listDouwe Maan2015-12-022-2/+2
| * | Add plus icon to all "Add X" buttonsDouwe Maan2015-12-024-3/+6
| * | Add header title to import pagesDouwe Maan2015-12-0210-9/+19
| * | Don't use success state for "Download zip" buttonDouwe Maan2015-12-021-2/+2
| * | Use "Delete" in milestone and label delete buttons instead of "Remove"Douwe Maan2015-12-025-5/+5
| * | Don't use success state for explore projects search buttonDouwe Maan2015-12-021-1/+1
| * | Truncate submodule commit SHAs to 7 charactersDouwe Maan2015-12-021-2/+2
| * | Capitalize tab titlesDouwe Maan2015-12-023-5/+5
| * | Use same text color for commit box as issue titleDouwe Maan2015-12-021-4/+2
* | | Merge branch 'ui/no-minimal-height' into 'master' Dmitriy Zaporozhets2015-12-023-6/+8
|\ \ \
| * | | Remove minimum containe heightui/no-minimal-heightDouwe Maan2015-12-023-6/+8
| |/ /
* | | Merge branch 'ui/gl-padding' into 'master' Dmitriy Zaporozhets2015-12-0237-240/+200
|\ \ \
| * | | Fix styling of empty repo messageui/gl-paddingDouwe Maan2015-12-022-7/+4
| * | | Remove unused styleDouwe Maan2015-12-021-4/+0
| * | | Use consistent border colorDouwe Maan2015-12-021-2/+2
| * | | Consistent styling for dashboard groups gray blockDouwe Maan2015-12-021-2/+2
| * | | No bottom margin for form help blocksDouwe Maan2015-12-021-0/+4
| * | | Render all form controls at the same heightDouwe Maan2015-12-021-0/+2
| * | | Remove style duplication between snippet and issue detail pagesDouwe Maan2015-12-022-42/+9
| * | | Use table-holder where appropriateDouwe Maan2015-12-022-49/+51
| * | | Fix padding of no readme and empty repo messagesDouwe Maan2015-12-023-20/+20
| * | | Remove double border between gray blocksDouwe Maan2015-12-022-1/+8
| * | | Remove duplicated styling for center top menusDouwe Maan2015-12-028-42/+9
| * | | Remove padding around form-actionsDouwe Maan2015-12-024-6/+8
| * | | Fix padding around editor path, input and select box.Douwe Maan2015-12-022-39/+29
| * | | Fix alignment of buttons in issue headerDouwe Maan2015-12-022-4/+6
| * | | Use gl-padding instead of 15px/20px where appropriateDouwe Maan2015-12-0213-22/+42
| * | | Remove bottom margin from page-titlesDouwe Maan2015-12-021-0/+4
| |/ /
* | | Merge branch 'workhorse_in_patch_update' into 'master' Hannes Rosenögger2015-12-021-13/+32
|\ \ \
| * | | Also update gitlab-workhorse in patch updates [ci skip]workhorse_in_patch_updateAchilleas Pipinellis2015-12-021-13/+32
| |/ /
* | | Merge pull request #9873 from atomaka/atomaka/feature/prevent-blocked-imperso...Stan Hu2015-12-024-6/+41
|\ \ \