summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-024-45/+41
| | |\
| | | * Store original user in variableDouwe Maan2016-04-221-2/+2
| | | * Remove unused methodDouwe Maan2016-04-221-4/+0
| | | * Fix issue with impersonationDouwe Maan2016-04-224-45/+45
| | * | Merge branch '15527-fix-wiki-page-creation-issue' into 'master' Robert Speicher2016-05-021-2/+2
| | |\ \
| | | * | Fix error when trying to create a wiki pageRémy Coutable2016-04-291-2/+2
| | * | | Merge branch 'feature/backport-safewebhooks' into 'master' Robert Speicher2016-05-022-4/+18
| | |\ \ \
| | | * | | Added UI to define secret_token for webhook and systemhookfeature/backport-safewebhooksGabriel Mazetto2016-05-022-4/+18
| | | |/ /
| | * | | Handle issue move access instead of raising errorfix/handle-issue-move-accessGrzegorz Bizon2016-04-301-0/+2
| | |/ /
| | * | Merge branch 'async-new-branch-button' into 'master' Jacob Schatz2016-04-281-2/+14
| | |\ \
| | | * | Load the "New Branch" button asynchronouslyYorick Peterse2016-04-281-2/+14
| | * | | Merge branch 'project-deploy-keys-ui' into 'master' Jacob Schatz2016-04-281-13/+18
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Project deploy keys updated UIPhil Hughes2016-04-251-13/+18
| | | |/
| | * | Updated based on feedbacksearch-ui-updatePhil Hughes2016-04-261-2/+3
| | * | Fixed issue with dropdown option not stickingPhil Hughes2016-04-261-4/+3
| | |/
* | | 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
|\ \ \ | | |/ | |/|
| * | Fixed issue with assignee object not being returnedPhil Hughes2016-04-222-2/+2
| * | Merge branch 'issue_3799' into 'master' Rémy Coutable2016-04-221-0/+2
| |\ \
| | * \ Merge remote-tracking branch 'origin/master' into issue_3799Alfredo Sumaran2016-04-2110-49/+59
| | |\ \ | | | |/
| | * | Use compact syntaxAlfredo Sumaran2016-04-211-4/+1
| | * | Allow filtering by Owned projectsAlfredo Sumaran2016-04-181-0/+5
| * | | Merge branch 'confirmation-screen' into 'master' Robert Speicher2016-04-222-2/+11
| |\ \ \
| | * | | Improved confirmation UXconfirmation-screenPhil Hughes2016-04-212-2/+11
| * | | | Merge branch 'rs-diff_view' into 'master' Rémy Coutable2016-04-221-2/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Clarify that the diff view setting always comes from the cookiers-diff_viewRobert Speicher2016-04-191-2/+1
| * | | | Merge branch 'label-text-color-sidebar' into 'master' Robert Speicher2016-04-212-2/+2
| |\ \ \ \
| | * | | | Fixes text color on labels in sidebarPhil Hughes2016-04-212-2/+2
| * | | | | Merge branch 'remove-update-files' into 'master' Yorick Peterse2016-04-212-2/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Removed JS update templatesremove-update-filesPhil Hughes2016-04-192-2/+0
| | | |_|/ | | |/| |
* | | | | Merge branches 'feature/project-export' and 'feature/project-import' into fea...James Lopez2016-04-2223-124/+198
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'issue_5838' into 'master' Rémy Coutable2016-04-211-1/+1
| |\ \ \ \
| | * | | | Remove unused authorization from controllerFelipe Artur2016-04-201-5/+0
| | * | | | Show project members only for membersFelipe Artur2016-04-181-1/+6
| | |/ / /
View Lorry Controller Status