summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'add_autocomplete_for_labels' into 'master' Robert Speicher2016-06-171-0/+1
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into add_autocomplet...Fatih Acet2016-06-1460-224/+810
| |\
| * | add gfm autocomplete for labelsArinde Eniola2016-05-031-0/+1
* | | Rename ci_commit to pipeline18131-pressing-merge-when-build-succeeds-at-the-same-exact-time-that-a-build-is-failing-will-merge-the-failed-buildZ.J. van de Weg2016-06-151-5/+5
* | | Fix race condition on auto mergeZeger-Jan van de Weg2016-06-151-3/+12
* | | Merge branch '18225-avoid-full-table-users-count' into 'master' Jacob Vosmaer (GitLab)2016-06-151-1/+1
|\ \ \
| * | | Check if the Users table has exactly one user limiting the whole set18225-avoid-full-table-users-countPaco Guzman2016-06-061-1/+1
* | | | Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-154-3/+52
|\ \ \ \
| * | | | Improve forms and specsKamil Trzcinski2016-06-151-2/+2
| * | | | Improve design after reviewKamil Trzcinski2016-06-141-8/+9
| * | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-141-6/+11
| |\ \ \ \
| * | | | | Authorize environments controller actionsKamil Trzcinski2016-06-141-0/+2
| * | | | | Make retry action on pipeline to save a userKamil Trzcinski2016-06-141-1/+1
| * | | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-143-7/+20
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Add deployment viewsKamil Trzcinski2016-06-111-1/+28
| * | | | | Added initial version of deploymentsKamil Trzcinski2016-06-103-8/+10
| * | | | | commit statusKamil Trzcinski2016-06-101-0/+17
* | | | | | Merge branch 'project-move-dropdown-search' into 'master' Jacob Schatz2016-06-151-0/+1
|\ \ \ \ \ \
| * | | | | | Fixed issue with move dropdown not being searchableproject-move-dropdown-searchPhil Hughes2016-06-151-0/+1
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-154-41/+113
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-141-0/+31
| |\ \ \ \ \ \
| | * | | | | | Returns created todos to control rather than re-queryPhil Hughes2016-06-141-2/+2
| | * | | | | | Uses update URL to update the status of a todoPhil Hughes2016-06-141-9/+12
| | * | | | | | Moved todo creation over to project todos controllerPhil Hughes2016-06-143-28/+28
| | * | | | | | Manually create todo for issuablePhil Hughes2016-06-142-0/+28
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-141-6/+11
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-144-111/+70
| * | | | | | Factorize access request routes into a new :access_requestable route concernRémy Coutable2016-06-141-1/+1
| * | | | | | Factorize #request_access and #approve_access_request into a new AccessReque...Rémy Coutable2016-06-143-31/+66
| * | | | | | Add request access for groupsRémy Coutable2016-06-142-29/+49
| * | | | | | Initial implementation of user access request to projectsDavid Alexander2016-06-141-2/+29
| | |/ / / / | |/| | | |
* | | | | | Merge branch '17298-wiki-xss' into 'master' Robert Speicher2016-06-141-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Forbid scripting for wiki filesSean McGivern2016-06-141-0/+3
| |/ / / /
* | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-142-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-132-2/+2
| |\ \ \ \
| | * | | | Improve Gitlab::Auth method namesJacob Vosmaer2016-06-102-2/+2
* | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-131-5/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'issue_3359_2' into 'master' Douwe Maan2016-06-131-5/+18
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Remove notification level fild from users, improve migrations and specsissue_3359_2Felipe Artur2016-06-101-8/+5
| | * | | | Remove notification level from user modelFelipe Artur2016-06-101-4/+20
* | | | | | Test controllers if they allow to keep artifactsKamil Trzcinski2016-06-131-0/+1
* | | | | | Remove keep_artifacts from BuildsControllerKamil Trzcinski2016-06-131-6/+0
* | | | | | Validate existence of artifacts in ArtifactsController, render 404 if not foundKamil Trzcinski2016-06-131-6/+5
* | | | | | Move keep to ArtifactsControllerKamil Trzcinski2016-06-131-0/+5
* | | | | | Allow to expire build artifactsKamil Trzcinski2016-06-131-0/+6
|/ / / / /
* | | | | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-105-15/+6
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-106-42/+153
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Add send_git_diff helperDouwe Maan2016-06-088-29/+70
| |\ \ \ \ \
| * | | | | | Add workhorse controller and API helpersDouwe Maan2016-06-064-10/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ci-page-ui-update' into 'master' Jacob Schatz2016-06-101-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |