summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/error-when-invalid-branch-for-new-pipeline-used' into 'mast...Douwe Maan2016-11-101-1/+3
|\
| * Improve code readability in pipelines controllerGrzegorz Bizon2016-11-071-1/+3
* | Merge branch 'unauthenticated-container-registry-access' into 'security'Alejandro Rodriguez2016-11-091-2/+2
* | Merge branch '23403-fix-events-for-private-project-features' into 'security'Robert Speicher2016-11-091-2/+1
* | Merge branch 'fix-unathorized-cloning' into 'security'Douwe Maan2016-11-092-9/+5
* | Merge branch 'rs-project_params' into 'master' Rémy Coutable2016-11-081-17/+35
|\ \
| * | Apply `*_params_ce` pattern to ProjectsControllerrs-project_paramsRobert Speicher2016-11-071-17/+35
* | | Merge branch '24255-search-fix' into 'master' Rémy Coutable2016-11-081-1/+1
|\ \ \
| * | | Fix broken commits search24255-search-fixValery Sizov2016-11-081-1/+1
| |/ /
* | | Merge branch 'use-separate-token-for-incoming-email' into 'master' Douwe Maan2016-11-082-1/+16
|\ \ \
| * | | implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-emailtiagonbotelho2016-11-072-2/+9
| * | | Use separate email-friendly token for incoming email and let incomingDouwe Maan2016-11-071-1/+9
| | |/ | |/|
* | | Merge branch 'dz-fix-project-index' into 'master' Sean McGivern2016-11-081-3/+3
|\ \ \
| * | | Fix project indexDmitriy Zaporozhets2016-11-071-3/+3
| | |/ | |/|
* | | Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' in...Sean McGivern2016-11-081-1/+13
|\ \ \ | |/ / |/| |
| * | Refactor method nameHiroyuki Sato2016-11-081-2/+2
| * | Fix bug of json request urlHiroyuki Sato2016-11-071-3/+10
| * | Remove 'extended_sha1' option from ExtractsPath moduleHiroyuki Sato2016-11-061-0/+1
| * | Separete a very long lineHiroyuki Sato2016-11-061-1/+3
| * | Network page appear with an error message when entering nonexistent git revisionHiroyuki Sato2016-11-061-1/+3
| |/
* | Merge branch 'jacobvosmaer-gitlab/gitlab-ce-git-gc-improvements' into 'master' Douwe Maan2016-11-071-0/+5
|\ \ | |/ |/|
| * Refine Git garbage collectionJacob Vosmaer2016-11-041-0/+5
* | Merge branch 'show-status-from-branch' into 'master' Rémy Coutable2016-11-043-4/+22
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-043-3/+7
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-11-028-17/+17
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-261-3/+6
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into show-status-from-branchLin Jen-Shin2016-10-253-3/+11
| |\ \ \ \ \
| * | | | | | Pass `@ref` along so we know which pipeline to showLin Jen-Shin2016-10-243-4/+22
* | | | | | | Merge branch 'rs-merge_request_params' into 'master' Robert Speicher2016-11-041-6/+21
|\ \ \ \ \ \ \
| * | | | | | | Apply `*_params_ce + *_params_ee` pattern to MergeRequestsControllerRobert Speicher2016-11-041-6/+21
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master' Douwe Maan2016-11-041-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Complete and improve specsRémy Coutable2016-11-041-2/+2
| * | | | | | Add setting to only allow merge requests to be merged when all discussions ar...Rodolfo Santos2016-11-041-2/+3
* | | | | | | Merge branch '22588-todos-filter-shows-all-users' into 'master' Sean McGivern2016-11-041-1/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix: Todos Filter Shows All Users22588-todos-filter-shows-all-usersValery Sizov2016-11-041-1/+5
| |/ / / / /
* | | | | | Only skip group when it's actually a group in the "Share with group" select23961-can-t-share-project-with-groupsRémy Coutable2016-11-041-1/+1
|/ / / / /
* | | | | Allow multiple repository storage shards to be enabled, and automatically rou...Nick Thomas2016-11-041-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'Allow-admin-to-search-for-user-by-secondary-email-address' into...Sean McGivern2016-11-011-1/+1
|\ \ \ \
| * | | | Allow to search for user by secondary email address in the admin interfaceYar2016-11-011-1/+1
| * | | | Rename :name search parameter to :search_query at /admin/usersYar2016-11-011-1/+1
* | | | | Merge branch 'adam-fix-wiki-links-markdown' into 'master' Sean McGivern2016-11-011-1/+2
|\ \ \ \ \
| * | | | | Fix relative links in Markdown wiki when displayed in "Project" tabadam-fix-wiki-links-markdownAdam Niedzielski2016-11-011-1/+2
* | | | | | Merge branch 'refactor_group_members' into 'master' Sean McGivern2016-11-011-10/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Implement CreateMembers service to make controller thinrefactor_group_membersValery Sizov2016-11-011-10/+7
| |/ / / /
* | | | | Remove unnecessary includes(:priorities) on Projects::LabelsControllerDouglas Barbosa Alexandre2016-10-311-1/+1
|/ / / /
* | | | Merge branch '22271-drone-tag-pipeline-build' into 'master' Douwe Maan2016-10-311-1/+1
|\ \ \ \
| * | | | Fix lightweight tags not processed correctly by GitTagPushService22271-drone-tag-pipeline-buildAlejandro Rodríguez2016-10-281-1/+1
* | | | | Merge branch '22392-add-x-of-y-tasks-completed-on-issuable' into 'master' Sean McGivern2016-10-282-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add "x of y tasks completed" on issuableGuilherme Salazar2016-10-282-2/+2
* | | | | Fixed boards store specissue-board-welcome-cookie-monsterPhil Hughes2016-10-281-2/+1