summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove project-issuable-filter from admin builds page :)improve-nav-controlsDmitriy Zaporozhets2016-02-053-27/+15
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Re-use top-are css component for issues/mr pagesDmitriy Zaporozhets2016-02-059-80/+75
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add support for inline form in nav-controls componentDmitriy Zaporozhets2016-02-051-0/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'doc_refactor_session_api' into 'master' Achilleas Pipinellis2016-02-051-17/+25
|\ | | | | | | | | | | | | Refactor session API documentation See merge request !2473
| * 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 See merge request !2468
| * | 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 lists * improve consistency for list padding * reduce padding for project/group/events lists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #12511 cc @jschatz1 @skyruler @creamzy See merge request !2715
| * | New padding for listslist-paddingDmitriy Zaporozhets2016-02-0410-26/+15
| | | | | | | | | | | | | | | | | | | | | * improve consistency for list padding * reduce padding for project/group/events lists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'rymai/gitlab-ce-3007-fix-mr-label-links' into 'master' Rémy Coutable2016-02-055-24/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix label links for a merge request pointing to issues list _Originally opened at !2150._ --- I have added a type parameter to the `link_to_label` helper method that is set to `'merge_request'` when in the context of a merge request. I have also improved the specs to actually test the output of the method instead of its implementation. Fixes #3007. See merge request !2700
| * | | Allow link_to_label to take an optional type argrymai/gitlab-ce-3007-fix-mr-label-linksRémy Coutable2016-02-045-24/+29
| |/ / | | | | | | | | | | | | | | | You can set type: :merge_request to create a link to merge request lists instead of issues list. Accept both Symbol & String as type argument for the link_to_label helper
* | | Merge branch 'search-on-groups-is-ugly' into 'master' Dmitriy Zaporozhets2016-02-042-13/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Change placeholder text to just 'search' Fixes #13168 ![Screen_Shot_2016-02-04_at_12.30.16_PM](/uploads/ca3c5549abeedce99d693606135d7428/Screen_Shot_2016-02-04_at_12.30.16_PM.png) See merge request !2711
| * | 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. Fixes #13192 ![Screen_Shot_2016-02-04_at_11.51.15_AM](/uploads/a10dc24b4a836199351ba98fca266695/Screen_Shot_2016-02-04_at_11.51.15_AM.png) See merge request !2710
| * | | 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
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Implement new design for issue and merge request right sidebar Fixes #3981 See merge request !2645
| * | | 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
| | | | | | | | | | | | | | | | Thanks @rspeicher.
| * | | 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
| | | | | | | | | | | | | | | | | | | | Fix subtitles on minimize. Fix styles for show.
| * | | 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
| | | | | | | | | | | | | | | | Hide and show icons in collapse and expanded mode.
| * | | 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
| | | | | | | | | | | | | | | | [WIP]
* | | | Merge branch 'fix-test' into 'master' Dmitriy Zaporozhets2016-02-041-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @DouweM See merge request !2708
| * | | | Fix broken testsDmitriy Zaporozhets2016-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'doc_bug' into 'master' Drew Blessing2016-02-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix documentation bug / typo Hey, noticed this a little bit ago. Need to get the example matching up with the following explanation. See merge request !2709
| * | | | | fix documentation bug / typoEric L Frederich2016-02-041-1/+1
| | | | | |
* | | | | | Merge branch 'fix/atom-url-issue' into 'master' Douwe Maan2016-02-046-4/+93
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix atom url issue on projects This MR adds prevents a project to have a path ending in .atom that conflicts with the feed and Adds a migration to migrate old .atom projects to a different path Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699 See merge request !2651
| * | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Display database type and version in Administration dashboardrs-database-infoRobert Speicher2016-02-024-6/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #12900
View Lorry Controller Status