summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add spec for assigning view param from cookiekkm/gitlab-ce-user-diff-view-pref-cookieRobert Speicher2016-02-051-5/+19
* Update CHANGELOGRobert Speicher2016-02-051-1/+1
* Add a controller test for the new 'diff_view' cookieRémy Coutable2016-02-052-4/+14
* Remember user's inline/tabular diff view preference in a cookiekkm2016-02-054-0/+12
* Merge branch 'doc_refactor_session_api' into 'master' Achilleas Pipinellis2016-02-051-17/+25
|\
| * Refactor session API documentation [ci skip]doc_refactor_session_apiAchilleas Pipinellis2016-01-181-17/+25
* | Merge branch 'doc_refactor_deploy_key_multiple_projects_api' into 'master' Achilleas Pipinellis2016-02-051-7/+11
|\ \
| * | Refactor deploy_key_multiple_projects API documentation [ci skip]doc_refactor_deploy_key_multiple_projects_apiAchilleas Pipinellis2016-01-181-7/+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-055-24/+29
|\ \ \
| * | | Allow link_to_label to take an optional type argrymai/gitlab-ce-3007-fix-mr-label-linksRémy Coutable2016-02-045-24/+29
| |/ /
* | | 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 branch 'fix-test' into 'master' Dmitriy Zaporozhets2016-02-041-2/+2
|\ \ \ \
| * | | | Fix broken testsDmitriy Zaporozhets2016-02-041-2/+2
* | | | | Merge branch 'doc_bug' into 'master' Drew Blessing2016-02-041-1/+1
|\ \ \ \ \
| * | | | | fix documentation bug / typoEric L Frederich2016-02-041-1/+1
* | | | | | Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan2016-02-046-4/+93
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | refactored migration based on feedbackJames Lopez2016-02-041-1/+5
| * | | | | refactored migration and spec based on feedbackJames Lopez2016-02-042-8/+14
| * | | | | fixed move project method in migrationJames Lopez2016-02-023-35/+15
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez2016-02-0221-32/+414
| |\ \ \ \ \
| * | | | | | added TODO to not working methodJames Lopez2016-02-011-0/+1
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez2016-02-0157-379/+433
| |\ \ \ \ \ \
| * | | | | | | WIP - refactored migrationJames Lopez2016-02-012-7/+43
| * | | | | | | WIP - add migrationJames Lopez2016-01-291-0/+54
| * | | | | | | refactor previous test and add validation to project modelJames Lopez2016-01-292-8/+5
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issueJames Lopez2016-01-29258-1732/+12958
| |\ \ \ \ \ \ \
| * | | | | | | | WIP - spec failure on .atom project URLJames Lopez2016-01-221-0/+11
* | | | | | | | | Merge remote-tracking branch 'origin/rs-database-info'Dmitriy Zaporozhets2016-02-044-6/+58
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
View Lorry Controller Status