summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops...Kamil Trzcinski2017-09-0785-723/+1336
|\
| * Merge branch '35012-navigation-add-option-to-change-navigation-color-palette'...Sean McGivern2017-09-0714-99/+432
| |\
| | * Small refactor after last code review.35012-navigation-add-option-to-change-navigation-color-paletteRuben Davila2017-09-071-1/+1
| | * Finish light themeAnnabel Dunstone Gray2017-09-062-13/+78
| | * Add previews in preferencesAnnabel Dunstone Gray2017-09-062-2/+73
| | * Fix specs; start on light themeAnnabel Dunstone Gray2017-09-064-29/+58
| | * Add blue themeAnnabel Dunstone Gray2017-09-062-3/+19
| | * Finish adding dark themeAnnabel Dunstone Gray2017-09-064-98/+179
| | * Start CSS for dark themeAnnabel Dunstone Gray2017-09-063-107/+31
| | * Add functionality for two themesAnnabel Dunstone Gray2017-09-065-1/+141
| | * Restore some changes from !9199Rubén Dávila2017-09-064-1/+8
| * | Make dropdown menus on navigation to use full viewport widthKushal Pandya2017-09-072-8/+21
| * | Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-073-162/+22
| |\ \
| | * | Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-063-162/+22
| * | | Merge branch '37530-fix-skip-to-content-alignment' into 'master'Tim Zallmann2017-09-071-1/+2
| |\ \ \
| | * | | Use `flex` to center align content37530-fix-skip-to-content-alignmentkushalpandya2017-09-071-1/+2
| * | | | #34945: add a div id to the readme section in the project overviewRiccardo Padovani2017-09-072-3/+4
| * | | | Merge branch '37349-remove-extra-top-margin-search-dropdown' into 'master'Annabel Dunstone Gray2017-09-071-1/+1
| |\ \ \ \
| | * | | | Fix spacing between nav and dropdown to be consistent with other dropdowns37349-remove-extra-top-margin-search-dropdownkushalpandya2017-09-061-1/+1
| | |/ / /
| * | | | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-0756-434/+618
| |\ \ \ \
| | * | | | Fix failing specee_issue_928_backportFelipe Artur2017-09-061-1/+1
| | * | | | Finish backports and fix specsFelipe Artur2017-09-063-4/+14
| | * | | | api js changes not needed for CESimon Knox2017-09-061-10/+2
| | * | | | pick some missing JSSimon Knox2017-09-062-3/+5
| | * | | | backport scss for group boardsSimon Knox2017-09-062-44/+21
| | * | | | missing js changeSimon Knox2017-09-061-10/+10
| | * | | | backport haml changesSimon Knox2017-09-069-42/+50
| | * | | | move templates from projects to sharedSimon Knox2017-09-0612-9/+11
| | * | | | FE backport of group boards to reduce CE conflictsSimon Knox2017-09-0611-52/+94
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_ba...Simon Knox2017-09-06343-1902/+6924
| | |\ \ \ \
| | * | | | | Fix route conflictFelipe Artur2017-09-041-2/+2
| | * | | | | Fix specs BACKPORTFelipe Artur2017-09-041-1/+1
| | * | | | | Small fixesFelipe Artur2017-08-315-4/+11
| | * | | | | Continue BE backportFelipe Artur2017-08-3110-6/+51
| | * | | | | Group boards CE backportFelipe Artur2017-08-2824-267/+366
| * | | | | | Merge branch 'fix-stray-or-in-project-create-ui' into 'master'Rémy Coutable2017-09-071-2/+2
| |\ \ \ \ \ \
| | * | | | | | Fix stray OR in New Project pageRobin Bobbitt2017-09-061-2/+2
| * | | | | | | Merge branch 'fly-out-top-level-item' into 'master'Filipa Lacerda2017-09-077-13/+234
| |\ \ \ \ \ \ \
| | * | | | | | | Add top level items to fly-out navigationPhil Hughes2017-09-067-13/+234
* | | | | | | | | Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-tableZeger-Jan van de Weg2017-09-0731-122/+68
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'breadcrumbs-extra-btns-remove' into 'master'Filipa Lacerda2017-09-0718-94/+23
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fixed new milstone button not being visiblePhil Hughes2017-09-061-1/+1
| | * | | | | | | | fixed breadcrumb containerPhil Hughes2017-09-061-1/+1
| | * | | | | | | | Moves the action buttons out of the breadcrumbsPhil Hughes2017-09-0618-92/+21
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'rs-remove-usage-ping-pretty' into 'master'Sean McGivern2017-09-072-3/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove the `pretty` parameter for `usage_data`rs-remove-usage-ping-prettyRobert Speicher2017-09-062-3/+2
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'gitaly-tree-entries-fix' into 'master'Rémy Coutable2017-09-072-2/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-062-2/+4
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Fix mr tabs positionAnnabel Dunstone Gray2017-09-073-8/+16
| * | | | | | | | Merge branch '37023-remove-focus-styles-from-dropdown-empty-link' into 'master'Tim Zallmann2017-09-075-14/+22
| |\ \ \ \ \ \ \ \