summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add a controller test for the new 'diff_view' cookieRémy Coutable2016-02-051-3/+1
* Remember user's inline/tabular diff view preference in a cookiekkm2016-02-053-0/+11
* Merge branch 'list-padding' into 'master' Dmitriy Zaporozhets2016-02-0510-26/+15
|\
| * New padding for listslist-paddingDmitriy Zaporozhets2016-02-0410-26/+15
* | Merge branch 'rymai/gitlab-ce-3007-fix-mr-label-links' into 'master' Rémy Coutable2016-02-053-6/+13
|\ \
| * | Allow link_to_label to take an optional type argrymai/gitlab-ce-3007-fix-mr-label-linksRémy Coutable2016-02-043-6/+13
| |/
* | Merge branch 'search-on-groups-is-ugly' into 'master' Dmitriy Zaporozhets2016-02-042-13/+1
|\ \ | |/ |/|
| * Change placeholder text to just 'search'search-on-groups-is-uglyJacob Schatz2016-02-042-13/+1
* | Merge branch 'fuzzy-file-search-menu-shortcut-placement' into 'master' Dmitriy Zaporozhets2016-02-041-4/+4
|\ \
| * | Puts shortcut key in the right place.fuzzy-file-search-menu-shortcut-placementJacob Schatz2016-02-041-4/+4
* | | Merge branch 'feature/jschatz1/issuable-sidebar' into 'master' Dmitriy Zaporozhets2016-02-0418-115/+463
|\ \ \ | |_|/ |/| |
| * | Properly link to the right issue or merge requestfeature/jschatz1/issuable-sidebarJacob Schatz2016-02-042-2/+22
| * | Resize sidebar on initial page refresh.Jacob Schatz2016-02-041-2/+10
| * | Make size changes based on screen resize.Jacob Schatz2016-02-032-0/+37
| * | Fixes sidebar width.Jacob Schatz2016-02-032-4/+11
| * | Issue sidebar bug fix.Jacob Schatz2016-02-032-5/+3
| * | Fix sidebar replacement for issues & MRsJacob Schatz2016-02-031-1/+1
| * | Sidebar works after sidebar ajax calls.Jacob Schatz2016-02-026-9/+10
| * | Added correct colors and styles from antetype mockup.Jacob Schatz2016-02-024-11/+12
| * | Add ajax calls to return JSONJacob Schatz2016-01-306-5/+14
| * | Add detail to collapsed iconsJacob Schatz2016-01-284-3/+44
| * | Fix icon centering on collapsed viewJacob Schatz2016-01-281-7/+6
| * | Sidebar collapse and expand work with whole page.Jacob Schatz2016-01-287-17/+108
| * | Add icon when collapsed.Jacob Schatz2016-01-282-2/+26
| * | Add js to expand and contract side menuJacob Schatz2016-01-274-14/+39
| * | Adds prev/next buttons to top areaJacob Schatz2016-01-273-4/+33
| * | New right side gutter design.Jacob Schatz2016-01-2710-97/+155
* | | Merge remote-tracking branch 'origin/rs-database-info'Dmitriy Zaporozhets2016-02-041-0/+5
|\ \ \
| * | | Display database type and version in Administration dashboardrs-database-infoRobert Speicher2016-02-021-0/+5
* | | | Merge branch 'rs-backport-ldap-2fa' into 'master' Dmitriy Zaporozhets2016-02-042-28/+32
|\ \ \ \
| * | | | Support Two-factor Authentication for LDAP usersrs-backport-ldap-2faRobert Speicher2016-02-032-28/+32
* | | | | Merge branch 'better-search-autocomplete'Dmitriy Zaporozhets2016-02-041-2/+2
|\ \ \ \ \
| * | | | | In search autocomplete show only groups and projects you are member ofbetter-search-autocompleteDmitriy Zaporozhets2016-02-041-2/+2
* | | | | | Merge branch 'disable-remove-source-branch' into 'master' Douwe Maan2016-02-041-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Hide remove source branch button when new commit is added to branchZeger-Jan van de Weg2016-02-041-1/+2
* | | | | | Sort projects by last activity for new issue dropdownnew-issue-projects-sortDmitriy Zaporozhets2016-02-041-1/+1
* | | | | | Merge branch 'wipMergeSpacing' into 'master' Douwe Maan2016-02-041-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into wipMergeSpacingTed Hogan2015-12-29546-5570/+8205
| |\ \ \ \ \
| * | | | | | No space required after WIP identifierTed Hogan2015-11-231-1/+1
* | | | | | | Merge branch 'sort-projects-dropdown' into 'master' Dmitriy Zaporozhets2016-02-043-3/+9
|\ \ \ \ \ \ \
| * | | | | | | Satisfy rubocopDmitriy Zaporozhets2016-02-041-1/+2
| * | | | | | | Sort projects by last activity for project switcher in headersort-projects-dropdownDmitriy Zaporozhets2016-02-033-3/+8
* | | | | | | | Merge branch 'master' into use-top-areaDmitriy Zaporozhets2016-02-0317-54/+47
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'dashboard-sort-dropdown' into 'master' Dmitriy Zaporozhets2016-02-0310-38/+39
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Add sort dropdown to dashboard projects pagedashboard-sort-dropdownDmitriy Zaporozhets2016-02-0310-38/+39
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'attach-file-cursor-position' into 'master' Jacob Schatz2016-02-031-2/+2
| |\ \ \ \ \ \
| | * | | | | | Keeps cursor at the correct place after changing text in dropzonePhil Hughes2016-01-291-7/+2
| | * | | | | | Adds the markdown link at the cursor poisitionPhil Hughes2016-01-291-1/+6
| * | | | | | | Merge branch 'remove-useless-text-tips' into 'master' Jacob Schatz2016-02-034-12/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Remove useless text tips on commonly used pagesDmitriy Zaporozhets2016-02-034-12/+0
| | | |/ / / / / | | |/| | | | |