summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-151-1/+1
|\
| * Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-141-0/+20
| |\
| * \ Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-144-2/+15
| |\ \
| * | | Added initial version of deploymentsKamil Trzcinski2016-06-101-1/+1
* | | | Revert "Added API endpoint for Sidekiq Metrics"revert-06e0ef07Patricio Cano2016-06-142-91/+0
* | | | Added API endpoint for Sidekiq MetricsPatricio Cano2016-06-142-0/+91
* | | | Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-141-0/+20
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-141-1/+1
| |\ \ \ | | | |/ | | |/|
| * | | Fix specsKamil Trzcinski2016-06-141-1/+1
| * | | Improve design based on reviewKamil Trzcinski2016-06-131-2/+3
| * | | Added keep artifacts API endpointKamil Trzcinski2016-06-131-0/+19
* | | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-141-4/+1
* | | | Add request access for groupsRémy Coutable2016-06-141-1/+1
| |/ / |/| |
* | | Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-131-1/+1
|\ \ \ | |/ / |/| |
| * | Improve Gitlab::Auth method namesJacob Vosmaer2016-06-101-1/+1
* | | Fix Error 500 when using closes_issues API with an external issue trackerStan Hu2016-06-113-1/+14
| |/ |/|
* | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-102-7/+13
|\ \
| * | Satisfy Rubocopworkhorse-helpersDouwe Maan2016-06-101-2/+2
| * | Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-104-5/+5
| |\ \ | | |/
| * | Add send_git_diff helperDouwe Maan2016-06-083-8/+8
| |\ \
| * | | Add workhorse controller and API helpersDouwe Maan2016-06-062-7/+13
* | | | Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb'...Rémy Coutable2016-06-101-3/+2
* | | | Allow or not merge MR with failed buildRui Anderson2016-06-101-1/+1
| |_|/ |/| |
* | | Allow custom text on 'almost there' pageSean McGivern2016-06-081-0/+1
* | | Fix pseudo n+1 queries with Note and Note Authors in issuables APIsAlejandro Rodríguez2016-06-082-3/+3
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-06-085-15/+22
|\ \ \ | | |/ | |/|
| * | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-061-1/+1
| |\ \
| | * \ Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-1/+1
| | |\ \ | | | |/
| | | * Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-061-1/+1
| * | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-062-6/+8
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-062-6/+8
| | |\ \ | | | |/
| | | * Merge branch 'rubocop/enable-ambiguous-operator-rubocop-lint' into 'master' Robert Speicher2016-06-051-3/+3
| | | |\
| | | | * Enable Lint/AmbiguousOperator rubocop coprubocop/enable-ambiguous-operator-rubocop-lintGrzegorz Bizon2016-06-031-3/+3
| | | * | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-034-8/+14
| | | |\ \
| | | * | | Incorportate feedbackZ.J. van de Weg2016-06-011-0/+2
| | | * | | Merge branch 'master' into awardablesZJ van de Weg2016-05-301-2/+1
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' into awardablesZJ van de Weg2016-05-255-2/+41
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-1810-100/+122
| | | |\ \ \ \ \
| | | * | | | | | Incorporate feedbackZeger-Jan van de Weg2016-05-111-2/+1
| | | * | | | | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-114-170/+173
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1113-22/+149
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Create table for award emojiZeger-Jan van de Weg2016-05-061-3/+4
| * | | | | | | | | | Rename all ci_commit[s] in application code to pipeline[s]Kamil Trzcinski2016-06-031-5/+5
| |/ / / / / / / / /
| * | | | | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-031-0/+5
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | fixup! Add `sha` parameter to MR accept APISean McGivern2016-06-021-1/+1
| | * | | | | | | | Add `sha` parameter to MR accept APISean McGivern2016-06-011-0/+5
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Fix other places where we still use commit attribute of BuildKamil Trzcinski2016-06-031-3/+3
| * | | | | | | | Use pipelines in context of ProjectKamil Trzcinski2016-06-032-3/+3
| * | | | | | | | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-022-2/+2
| |/ / / / / / /
* | | | | | | | Rename finder to find_in_gitlab_or_ldapJacob Vosmaer2016-06-021-1/+1