summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* few fixes after refactoring the whole UI stuffJames Lopez2016-06-142-4/+4
* adapted current services stuff to use new project import, plus fixes a few is...James Lopez2016-06-143-15/+20
* adding notifications stuff and more refactoring for exporting projectsJames Lopez2016-06-1411-6/+63
* new export stuff and viewJames Lopez2016-06-143-11/+25
* lots of refactoring to reuse import serviceJames Lopez2016-06-148-18/+34
* WIP - starting refactoring import/export to use servicesJames Lopez2016-06-133-5/+25
* Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-13645-6219/+9079
|\
| * fixed specs and refactored a few things due to recent model changes and merge...James Lopez2016-06-132-3/+5
| * Merge branches 'feature/project-export' and 'feature/project-import' of gitla...James Lopez2016-06-13644-6182/+9061
| |\
| | * refactored loads of things due to commits to pipeline changeJames Lopez2016-06-131-4/+4
| | * Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org...James Lopez2016-06-13272-2137/+4200
| | |\
| | | * Merge branch 'nav-offscreen-dz-patch' into 'master' Dmitriy Zaporozhets2016-06-115-27/+3
| | | |\
| | | | * Center layout navigation and remove iconsnav-offscreen-dz-patchDmitriy Zaporozhets2016-06-115-27/+3
| | | * | Merge branch '18417-nav-offscreen' into 'master' Dmitriy Zaporozhets2016-06-1116-179/+124
| | | |\ \ | | | | |/
| | | | * Fix preferences_spec test18417-nav-offscreenAnnabel Dunstone2016-06-102-5/+1
| | | | * Add back sidebar counters and usernameAnnabel Dunstone2016-06-109-15/+33
| | | | * Fix safari logo loading animation safari bugAnnabel Dunstone2016-06-102-8/+1
| | | | * Revert side nav to full width; remove border under nav; remove tooltips on na...Annabel Dunstone2016-06-1012-145/+52
| | | | * Update media queriesAnnabel Dunstone2016-06-101-3/+3
| | | | * Fix profile testAnnabel Dunstone2016-06-101-1/+1
| | | | * Fix logo at all screen widths, update sidebar textAnnabel Dunstone2016-06-107-56/+78
| | | | * Move tanuki icon to center of nav bar; keep nav closed by default; remove col...Annabel Dunstone2016-06-108-36/+44
| | | * | Merge branch '18463-search-form-padding-is-too-damn-high' into 'master' Dmitriy Zaporozhets2016-06-111-1/+0
| | | |\ \
| | | | * | Fixed search form paddingLuke "Jared" Bennett2016-06-101-1/+0
| | | * | | Merge branch 'finding-multiple-projects-by-paths' into 'master' Robert Speicher2016-06-101-11/+60
| | | |\ \ \
| | | | * | | Add Project.where_paths_infinding-multiple-projects-by-pathsYorick Peterse2016-06-101-11/+60
| | | * | | | Merge branch '18462-remove-unused-mergerequest-gitlab_merge_status-method' in...Robert Speicher2016-06-101-8/+0
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Remove unused MergeRequest#gitlab_merge_status methodRémy Coutable2016-06-101-8/+0
| | | * | | | Merge branch 'labels-placement' into 'master' Dmitriy Zaporozhets2016-06-107-91/+108
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Render issues link on issues subnav unless you visit merge request controllerDmitriy Zaporozhets2016-06-101-1/+1
| | | | * | | Render only issues/mr in subnav depends on contextDmitriy Zaporozhets2016-06-102-3/+3
| | | | * | | Move Labels and Milestones as sub tab to Issues/MRDmitriy Zaporozhets2016-06-107-90/+107
| | | * | | | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-106-15/+30
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-10111-484/+1050
| | | | |\ \ \ | | | | | |/ /
| | | | * | | Add send_git_diff helperDouwe Maan2016-06-08114-909/+1439
| | | | |\ \ \
| | | | * | | | Add workhorse controller and API helpersDouwe Maan2016-06-065-10/+21
| | | * | | | | Merge branch 'ci-page-ui-update' into 'master' Jacob Schatz2016-06-1014-229/+296
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Fixed merge conflict that caused tests to fail with buildPhil Hughes2016-06-101-1/+1
| | | | * | | | CI build page UI updatePhil Hughes2016-06-1014-229/+296
| | | | | |_|/ | | | | |/| |
| | | * | | | Merge branch 'icon-color-fix' into 'master' Jacob Schatz2016-06-102-8/+8
| | | |\ \ \ \
| | | | * | | | Update activity SVG pathicon-color-fixAnnabel Dunstone2016-06-092-8/+8
| | | * | | | | Merge branch 'prettier-awardable-button-active' into 'master' Jacob Schatz2016-06-101-1/+9
| | | |\ \ \ \ \
| | | | * | | | | Made the awardable buttons prettier when activeprettier-awardable-button-activePhil Hughes2016-06-101-1/+9
| | | | | |/ / / | | | | |/| | |
| | | * | | | | Merge branch 'label-create-error-messages' into 'master' Jacob Schatz2016-06-101-1/+4
| | | |\ \ \ \ \
| | | | * | | | | Correctly shows label errors in dropdownlabel-create-error-messagesPhil Hughes2016-06-101-1/+4
| | | | |/ / / /
| | | * | | | | Merge branch 'user-search-dropdown' into 'master' Jacob Schatz2016-06-101-4/+4
| | | |\ \ \ \ \
| | | | * | | | | Revert change to search all usersPhil Hughes2016-06-101-4/+4
| | | | |/ / / /
| | | * | | | | Merge branch 'project-dropdown-position-fix' into 'master' Jacob Schatz2016-06-101-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Fixed project dropdown being overlapped by sidebarproject-dropdown-position-fixPhil Hughes2016-06-101-1/+1
| | | | |/ / / /
| | | * | | | | Merge branch 'label-filter-fix' into 'master' Jacob Schatz2016-06-103-4/+4
| | | |\ \ \ \ \
View Lorry Controller Status