summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-071-2/+27
|\
| * add :set_priorities to :authorize_admin_labels!Alfredo Sumaran2016-06-061-1/+1
| * Remove unnecesary paramAlfredo Sumaran2016-06-061-1/+1
| * Update method and routeAlfredo Sumaran2016-06-061-2/+2
| * Add unprioritized scopeAlfredo Sumaran2016-06-061-2/+2
| * Improve Issuable.order_labels_priorityRémy Coutable2016-06-061-5/+10
| * Sort by label priorityThijs Wouters2016-06-061-1/+1
| * Prioritize labels functionalityAlfredo Sumaran2016-06-061-1/+21
* | Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-071-3/+10
|\ \
| * | Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-031-3/+10
* | | Rename @ci_commit to @pipeline in MergeRequestControllerrename-ci-commit-phase-3Kamil Trzcinski2016-06-071-4/+4
* | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-062-1/+13
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-062-1/+13
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-062-1/+13
| | |\ \
| | | * | Backend awardables on commentsZJ van de Weg2016-06-062-1/+13
* | | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-067-39/+128
|\ \ \ \ \ | |/ / / /
| * | | | Use `@ci_commit` in merge_request_controllerKamil Trzcinski2016-06-061-4/+4
| * | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-066-35/+124
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-064-33/+122
| | |\ \ \
| | | * | | Add a U2F-specific audit log entry after logging in.Timothy Andrew2016-06-061-2/+11
| | | * | | Implement authentication (login) using a U2F device.Timothy Andrew2016-06-062-23/+59
| | | * | | Implement U2F registration.Timothy Andrew2016-06-062-6/+50
| | | * | | Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-061-2/+2
| | | |/ /
| | * | | Merge branch 'fix/unauthorized-access-to-build-data' into 'master' Douwe Maan2016-06-062-2/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Remove 'unscoped' from project builds selectionTomasz Maczukin2016-06-042-2/+2
* | | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-065-34/+51
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-065-34/+51
| |\ \ \ \ | | |/ / /
| | * | | Respond to .json onlyAlfredo Sumaran2016-06-031-1/+6
| | * | | WIP: allow adding and removing labels in bulkSean McGivern2016-06-031-1/+3
| | * | | Add label_ids to bulk_update_paramsAlfredo Sumaran2016-06-031-1/+1
| | * | | Ability to assign a label to multiple issuesAlfredo Sumaran2016-06-031-1/+2
| | |/ /
| | * | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-0311-37/+46
| | |\ \ | | | |/
| | * | Merge branch 'master' into awardablesZJ van de Weg2016-05-304-5/+21
| | |\ \
| | * \ \ Merge branch 'master' into awardablesZJ van de Weg2016-05-258-28/+114
| | |\ \ \
| | * | | | Fix backend merge mistakesZJ van de Weg2016-05-191-1/+1
| | * | | | Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-182-4/+11
| | |\ \ \ \
| | | * | | | Fix latests concernsZJ van de Weg2016-05-182-4/+11
| | * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-0/+34
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-1831-38/+201
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-114-5/+7
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1126-138/+202
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add tests on Awardables and Award EmojiZeger-Jan van de Weg2016-05-101-2/+1
| | * | | | | | | | Create table for award emojiZeger-Jan van de Weg2016-05-065-32/+35
| * | | | | | | | | Fix tests offenses: use `pipeline` of Ci::Build and rename viewsKamil Trzcinski2016-06-061-1/+1
* | | | | | | | | | Rename all ci_commit[s] in application code to pipeline[s]Kamil Trzcinski2016-06-032-6/+6
|/ / / / / / / / /
* | | | | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-031-0/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' Douwe Maan2016-06-031-0/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Don't allow merges with new commitsSean McGivern2016-06-011-0/+5
* | | | | | | | | | Fix other places where we still use commit attribute of BuildKamil Trzcinski2016-06-031-3/+3
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-031-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
View Lorry Controller Status