Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into ui/sidebarui/sidebar | Douwe Maan | 2015-12-03 | 88 | -348/+378 |
|\ | | | | | | | | | # Conflicts: # app/assets/stylesheets/framework/sidebar.scss | ||||
| * | Merge branch 'fix_master' into 'master' | Valery Sizov | 2015-12-03 | 2 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | Fix failures in master See merge request !1974 | ||||
| | * | Fix failures in master | Valery Sizov | 2015-12-03 | 2 | -2/+2 |
| | | | |||||
| * | | Merge branch 'deprecated_warnings' into 'master' | Dmitriy Zaporozhets | 2015-12-03 | 8 | -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_level | Valery Sizov | 2015-12-03 | 1 | -1/+1 |
| | | | |||||
| | * | fix Celluloid warnings | Valery Sizov | 2015-12-03 | 1 | -18/+3 |
| | | | |||||
| | * | fix deprecation messages in tests | Valery Sizov | 2015-12-03 | 6 | -10/+12 |
| | | | |||||
| | * | git rid of deprecated warningsdeprecated_warnings | Valery Sizov | 2015-12-02 | 1 | -0/+5 |
| | | | |||||
| * | | Merge branch 'test_fix' into 'master' | Valery Sizov | 2015-12-03 | 1 | -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ávila | 2015-12-03 | 1 | -1/+3 |
| |/ / | |||||
| * | | Merge branch 'ui/consistency' into 'master' | Dmitriy Zaporozhets | 2015-12-02 | 32 | -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/consistency | Douwe Maan | 2015-12-02 | 3 | -8/+9 |
| | | | | |||||
| | * | | Use file-type specific file icon in blame view and diff item | Douwe Maan | 2015-12-02 | 2 | -8/+15 |
| | | | | |||||
| | * | | Use monospace font for commit SHA in branch list | Douwe Maan | 2015-12-02 | 2 | -2/+2 |
| | | | | |||||
| | * | | Add plus icon to all "Add X" buttons | Douwe Maan | 2015-12-02 | 4 | -3/+6 |
| | | | | |||||
| | * | | Add header title to import pages | Douwe Maan | 2015-12-02 | 10 | -9/+19 |
| | | | | |||||
| | * | | Don't use success state for "Download zip" button | Douwe Maan | 2015-12-02 | 1 | -2/+2 |
| | | | | |||||
| | * | | Use "Delete" in milestone and label delete buttons instead of "Remove" | Douwe Maan | 2015-12-02 | 5 | -5/+5 |
| | | | | |||||
| | * | | Don't use success state for explore projects search button | Douwe Maan | 2015-12-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | Truncate submodule commit SHAs to 7 characters | Douwe Maan | 2015-12-02 | 1 | -2/+2 |
| | | | | |||||
| | * | | Capitalize tab titles | Douwe Maan | 2015-12-02 | 3 | -5/+5 |
| | | | | |||||
| | * | | Use same text color for commit box as issue title | Douwe Maan | 2015-12-02 | 1 | -4/+2 |
| | | | | |||||
| * | | | Merge branch 'ui/no-minimal-height' into 'master' | Dmitriy Zaporozhets | 2015-12-02 | 3 | -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-height | Douwe Maan | 2015-12-02 | 3 | -6/+8 |
| | |/ / | |||||
| * | | | Merge branch 'ui/gl-padding' into 'master' | Dmitriy Zaporozhets | 2015-12-02 | 37 | -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-padding | Douwe Maan | 2015-12-02 | 2 | -7/+4 |
| | | | | | |||||
| | * | | | Remove unused style | Douwe Maan | 2015-12-02 | 1 | -4/+0 |
| | | | | | |||||
| | * | | | Use consistent border color | Douwe Maan | 2015-12-02 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Consistent styling for dashboard groups gray block | Douwe Maan | 2015-12-02 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | No bottom margin for form help blocks | Douwe Maan | 2015-12-02 | 1 | -0/+4 |
| | | | | | |||||
| | * | | | Render all form controls at the same height | Douwe Maan | 2015-12-02 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | Remove style duplication between snippet and issue detail pages | Douwe Maan | 2015-12-02 | 2 | -42/+9 |
| | | | | | |||||
| | * | | | Use table-holder where appropriate | Douwe Maan | 2015-12-02 | 2 | -49/+51 |
| | | | | | |||||
| | * | | | Fix padding of no readme and empty repo messages | Douwe Maan | 2015-12-02 | 3 | -20/+20 |
| | | | | | |||||
| | * | | | Remove double border between gray blocks | Douwe Maan | 2015-12-02 | 2 | -1/+8 |
| | | | | | |||||
| | * | | | Remove duplicated styling for center top menus | Douwe Maan | 2015-12-02 | 8 | -42/+9 |
| | | | | | |||||
| | * | | | Remove padding around form-actions | Douwe Maan | 2015-12-02 | 4 | -6/+8 |
| | | | | | |||||
| | * | | | Fix padding around editor path, input and select box. | Douwe Maan | 2015-12-02 | 2 | -39/+29 |
| | | | | | |||||
| | * | | | Fix alignment of buttons in issue header | Douwe Maan | 2015-12-02 | 2 | -4/+6 |
| | | | | | |||||
| | * | | | Use gl-padding instead of 15px/20px where appropriate | Douwe Maan | 2015-12-02 | 13 | -22/+42 |
| | | | | | |||||
| | * | | | Remove bottom margin from page-titles | Douwe Maan | 2015-12-02 | 1 | -0/+4 |
| | |/ / | |||||
| * | | | Merge branch 'workhorse_in_patch_update' into 'master' | Hannes Rosenögger | 2015-12-02 | 1 | -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_update | Achilleas Pipinellis | 2015-12-02 | 1 | -13/+32 |
| | |/ / | |||||
| * | | | Merge pull request #9873 from ↵ | Stan Hu | 2015-12-02 | 4 | -6/+41 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | atomaka/atomaka/feature/prevent-blocked-impersonation Prevent impersonation if blocked | ||||
| | * | | | Be more explicit with the impersonate return URL | Andrew Tomaka | 2015-12-02 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Prevent impersonation if blocked | Andrew Tomaka | 2015-12-02 | 4 | -6/+41 |
| | |/ / | |||||
| * | | | Merge branch 'fix_permission_doc' into 'master' | Job van der Voort | 2015-12-02 | 1 | -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.md | Hannes Rosenögger | 2015-12-02 | 1 | -2/+5 |
| |/ / | |||||
* | | | Revert unrelated changes | Douwe Maan | 2015-12-02 | 1 | -0/+3 |
| | | | |||||
* | | | Page titles are title case. | Douwe Maan | 2015-12-02 | 1 | -2/+2 |
| | | |