summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '14918-add-filter-dropdown-to-tag-page' into 'master' Rémy Coutable2016-06-171-2/+4
|\
| * Add sorting dropdown to tag page14918-add-filter-dropdown-to-tag-pageAlejandro Rodríguez2016-06-161-2/+4
* | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-173-2/+96
|\ \
| * | a few changes based on MR feedbackJames Lopez2016-06-171-6/+12
| * | fixed merge conflicts on UI branchJames Lopez2016-06-1616-62/+214
| |\ \ | | |/
| * | lots of refactoring again based on feedback. Changed the UI slightly and also...James Lopez2016-06-152-11/+27
| * | cleanup namespace check now done by serviceJames Lopez2016-06-151-11/+0
| * | project export archiverJames Lopez2016-06-141-3/+1
| * | yay finally importing working with the new services structureJames Lopez2016-06-141-1/+1
| * | few fixes after refactoring the whole UI stuffJames Lopez2016-06-141-3/+3
| * | adapted current services stuff to use new project import, plus fixes a few is...James Lopez2016-06-141-4/+5
| * | adding notifications stuff and more refactoring for exporting projectsJames Lopez2016-06-142-2/+2
| * | lots of refactoring to reuse import serviceJames Lopez2016-06-142-7/+5
| * | WIP - starting refactoring import/export to use servicesJames Lopez2016-06-131-4/+21
| * | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-06-1356-215/+777
| |\ \
| * | | fixed permissionsJames Lopez2016-05-131-5/+1
| * | | updated controllers with permissions checkJames Lopez2016-05-133-69/+19
| * | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-096-4/+15
| |\ \ \
| * | | | add gitlab project controller - still WIPJames Lopez2016-05-041-0/+45
| * | | | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-...James Lopez2016-05-041-45/+0
| |\ \ \ \
| | * | | | refactored some namespace stuff and fixed project tree restorer spec. also re...James Lopez2016-05-041-45/+0
| * | | | | use worker in controllerJames Lopez2016-05-041-3/+6
| * | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-0311-69/+143
| |\ \ \ \ \ | | |/ / / /
| | * | | | fixing some rubucop warningsJames Lopez2016-05-031-2/+1
| | * | | | Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-05-0310-69/+98
| | |\ \ \ \
| * | | | | | refactoring and fixing a bunch of stuffJames Lopez2016-05-021-6/+2
| * | | | | | few fixes - import from UI workingJames Lopez2016-04-281-1/+3
| * | | | | | some JS magic to pass namespace and path importing projectsJames Lopez2016-04-271-3/+6
| * | | | | | adding more UI changes, updated controller, worker and refactored import serviceJames Lopez2016-04-261-5/+12
| * | | | | | more refactoring, now using custom job for processing project importsJames Lopez2016-04-261-2/+2
| * | | | | | refactoring, mainly UI stuff to follow other import actionsJames Lopez2016-04-261-4/+3
| * | | | | | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into...James Lopez2016-04-251-0/+46
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...James Lopez2016-04-256-8/+16
| | |\ \ \ \ \
| | * | | | | | changes to be picked by the UI branchJames Lopez2016-04-251-0/+46
| * | | | | | | gitlab import UI - icon, file selector, etc... Also updated font-awesome and ...James Lopez2016-04-221-1/+5
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project...James Lopez2016-04-226-8/+16
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branches 'feature/project-export' and 'feature/project-import' into fea...James Lopez2016-04-2223-124/+198
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | download export now workingJames Lopez2016-04-151-1/+10
| * | | | | | | some experimental UI stuff to test exportJames Lopez2016-04-141-0/+9
* | | | | | | | Merge branch '2979-personal-access-tokens' into 'master' Douwe Maan2016-06-172-12/+47
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-1613-55/+194
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Implement @DouweM's feedback.Timothy Andrew2016-06-162-18/+10
| * | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-1410-24/+28
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-0920-138/+404
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Implement @jschatz1's comments.Timothy Andrew2016-06-091-1/+1
| * | | | | | | | | | Fix rubocop spec.Timothy Andrew2016-06-031-1/+1
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-0343-109/+414
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Display appropriate errors when personal access token creation/revocation fails.Timothy Andrew2016-06-031-3/+9
| * | | | | | | | | | | Only show a personal access token right after its creation.Timothy Andrew2016-06-021-1/+2
| * | | | | | | | | | | Fix minor issues with the personal access tokens implementation.Timothy Andrew2016-06-011-4/+2
View Lorry Controller Status