summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Limit autocomplete to currently selected itemsAkram FARES2016-11-151-1/+3
* Merge branch '21076-deleted-merged-branches' into 'master' Douwe Maan2016-11-151-1/+8
|\
| * Add button to delete all merged branchesToon Claes2016-11-091-1/+8
* | Merge branch '24392-lfs-helper-refactor' into 'master' Douwe Maan2016-11-151-4/+0
|\ \
| * | Move the `objects` method to `LfsHelper` so that it is also available to `Lfs...24392-lfs-helper-refactorPatricio Cano2016-11-101-4/+0
* | | Merge branch 'fix-help-page-links' into 'master' Rémy Coutable2016-11-141-2/+2
|\ \ \
| * | | fix error links in help pageFu Xu2016-11-121-2/+2
* | | | Merge branch '24397-load-labels-on-mr-tabs' into 'master' Sean McGivern2016-11-111-0/+1
|\ \ \ \
| * | | | Ensure labels are loaded on "show" methods of MRAlex Sanford2016-11-111-0/+1
* | | | | Merge branch 'sidekiq-job-throttling' into 'master' Douwe Maan2016-11-111-1/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow the Sidekiq queues to throttle and the factor by which to throttle them...Patricio Cano2016-11-101-1/+3
| * | | | Allow certain Sidekiq jobs to be throttledPatricio Cano2016-11-101-0/+1
| | |/ / | |/| |
* | | | Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master' Sean McGivern2016-11-111-1/+1
|\ \ \ \
| * | | | Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-101-1/+1
| | |/ / | |/| |
* | | | Require projects before creating milestonegfyoung2016-11-101-1/+1
| |/ / |/| |
* | | 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
| |/ / / / /