summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ui/wikiDouwe Maan2015-12-0349-144/+168
|\
| * 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-031-1/+1
| |\ \ | | |/ | |/|
| | * fix deprecation messages in testsValery Sizov2015-12-031-1/+1
| * | Merge branch 'ui/consistency' into 'master' Dmitriy Zaporozhets2015-12-0224-32/+53
| |\ \
| | * | Brefer "Directory" over "Dir", "Files" over "Codeui/consistencyDouwe Maan2015-12-021-2/+3
| | * | 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-022-2/+2
| | * | Don't use success state for explore projects search buttonDouwe Maan2015-12-021-1/+1
| | * | Capitalize tab titlesDouwe Maan2015-12-021-3/+3
| | |/
| * | Merge branch 'ui/gl-padding' into 'master' Dmitriy Zaporozhets2015-12-0221-108/+111
| |\ \
| | * | Consistent styling for dashboard groups gray blockDouwe Maan2015-12-021-2/+2
| | * | Remove style duplication between snippet and issue detail pagesDouwe Maan2015-12-021-3/+4
| | * | 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-021-1/+4
| | * | Remove duplicated styling for center top menusDouwe Maan2015-12-026-8/+7
| | * | Remove padding around form-actionsDouwe Maan2015-12-023-3/+4
| | * | Fix padding around editor path, input and select box.Douwe Maan2015-12-021-11/+11
| | * | Use gl-padding instead of 15px/20px where appropriateDouwe Maan2015-12-025-11/+8
| | |/
| * | Prevent impersonation if blockedAndrew Tomaka2015-12-021-1/+1
| |/
* | Use new style for wikiDouwe Maan2015-12-028-51/+50
|/
* Merge branch 'rails_update_to_4_2' into 'master' Valery Sizov2015-11-304-4/+4
|\
| * fix specsrails_update_to_4_2Valery Sizov2015-11-304-4/+4
* | Merge branch 'fix-admin-page-personal-projects' into 'master' Dmitriy Zaporozhets2015-11-302-1/+14
|\ \
| * | Fix Error 500 when viewing user's personal projects from admin pageStan Hu2015-11-252-1/+14
| |/
* | Merge branch 'rs-clone-panel' into 'master' Dmitriy Zaporozhets2015-11-305-30/+16
|\ \
| * | Move project visibility level off of the clone panelrs-clone-panelRobert Speicher2015-11-272-8/+6
| * | Add clipboard button to project clone panelRobert Speicher2015-11-241-0/+2
| * | Rework the copy_to_clipboard logicRobert Speicher2015-11-243-6/+6
| * | Move HTTP/SSH clone button logic to helpersRobert Speicher2015-11-241-16/+2
* | | Decouple Markdown previews from DropzoneInputrs-markdown-previewRobert Speicher2015-11-251-1/+1
| |/ |/|
* | Merge branch 'new-member-page' into 'master' Dmitriy Zaporozhets2015-11-256-70/+64
|\ \
| * | Split group feature testsDmitriy Zaporozhets2015-11-252-2/+2
| * | Improve project members page UIDmitriy Zaporozhets2015-11-255-44/+36
| * | Improve UI for group members pageDmitriy Zaporozhets2015-11-252-30/+32
| |/
* | Merge branch 'sherlock-total-query-time' into 'master' Yorick Peterse2015-11-251-0/+6
|\ \ | |/ |/|
| * Added total query time to Sherlocksherlock-total-query-timeYorick Peterse2015-11-241-0/+6
* | Fix 500 error when update group member permissionDmitriy Zaporozhets2015-11-242-2/+2
|/
* Merge branch 'issue_2993' into 'master' Dmitriy Zaporozhets2015-11-232-2/+2
|\
| * Update copy used in alert message when deleting branches or tags. #2993issue_2993Rubén Dávila2015-11-192-2/+2
* | Add clipboard button to merge request cross-project referenceRobert Speicher2015-11-191-2/+4
* | Merge branch 'emoji_votes' into 'master' Dmitriy Zaporozhets2015-11-196-44/+33
|\ \
| * | adressing commentsValery Sizov2015-11-191-7/+7
| * | added spinach testsValery Sizov2015-11-191-18/+20