summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix specui/form-consistencyDouwe Maan2015-12-031-4/+4
|
* Fix specsDouwe Maan2015-12-032-5/+5
|
* Merge branch 'master' into ui/form-consistencyDouwe Maan2015-12-0388-348/+380
|\
| * Merge branch 'fix_master' into 'master' Valery Sizov2015-12-032-2/+2
| |\ | | | | | | | | | | | | | | | | | | Fix failures in master See merge request !1974
| | * Fix failures in masterValery Sizov2015-12-032-2/+2
| | |
| * | Merge branch 'deprecated_warnings' into 'master' Dmitriy Zaporozhets2015-12-038-29/+21
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Git rid of deprecated warnings after rails update https://gitlab.com/gitlab-org/gitlab-ce/issues/3798 https://gitlab.com/gitlab-org/gitlab-ce/issues/3797 See merge request !1946
| | * 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. See merge request !1973
| | * | 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
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Improve consistency across the board Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2577 See merge request !1954
| | * | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Remove minimum container height Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Before: ![Screen_Shot_2015-12-02_at_15.42.07](/uploads/1d8e19e4738bec39074cbb9afc400ad5/Screen_Shot_2015-12-02_at_15.42.07.png) After: ![Screen_Shot_2015-12-02_at_15.50.34](/uploads/56153fe19bb72163a2dc9dd83850ad89/Screen_Shot_2015-12-02_at_15.50.34.png) See merge request !1957
| | * | | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: More consistent alignment and padding See the commits for more details, the messages mostly speak for themselves. # Highlights: ## Merge request form bottom Before: ![mr_before](/uploads/de2ae608d300784b61818bc33538ac64/mr_before.png) After: ![mr_after](/uploads/9b1568d8287704ee9497cc029e827778/mr_after.png) ## Issue header Before: ![issue_before](/uploads/e8cc4fb316219f025ff7bd74c7da8677/issue_before.png) After: ![issue_after](/uploads/5fbad99f038571196c3c3c2bea304381/issue_after.png) ## Empty repository message Before: ![empty_before](/uploads/f6ab80aea9af9111c3dc260d5fa98cd6/empty_before.png) After: ![empty_after](/uploads/40a528f5a45f4e47776356c88aab24c4/empty_after.png) Fixes #3742 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2594 See merge request !1953
| | * | | 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] Fixes #3747 See merge request !1959
| | * | | Also update gitlab-workhorse in patch updates [ci skip]workhorse_in_patch_updateAchilleas Pipinellis2015-12-021-13/+32
| | |/ /
| * | | Merge pull request #9873 from ↵Stan Hu2015-12-024-6/+41
| |\ \ \ | | | | | | | | | | | | | | | | | | | | atomaka/atomaka/feature/prevent-blocked-impersonation Prevent impersonation if blocked
| | * | | Be more explicit with the impersonate return URLAndrew Tomaka2015-12-021-1/+1
| | | | |
| | * | | Prevent impersonation if blockedAndrew Tomaka2015-12-024-6/+41
| | |/ /
| * | | Merge branch 'fix_permission_doc' into 'master' Job van der Voort2015-12-021-2/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed the documentation of the Guest role in permission.md This MR fixes the documentation of the Guest role. closes gitlab-org/gitlab-ce#3777 cc @dblessing @JobV See merge request !1952
| | * | fixed the documentation of the Guest role in permission.mdHannes Rosenögger2015-12-021-2/+5
| |/ /