summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-214-32/+39
|\
| * fixup! override content methodZ.J. van de Weg2016-06-201-5/+1
| * Incorporate reviewZ.J. van de Weg2016-06-201-1/+5
| * Implement backend gitlab ci dropdownZ.J. van de Weg2016-06-201-1/+2
| * Refactor Gitlab::GitignoresZJ van de Weg2016-06-204-32/+38
* | Merge branch 'feature/runner-lock-on-project' into 'master' Rémy Coutable2016-06-212-3/+10
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-206-27/+247
| |\ \ | | |/
| * | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-173-6/+23
| |\ \
| * | | Return the association and check it in controller instead:Lin Jen-Shin2016-06-141-1/+3
| * | | Merge branch 'prefer-assign_to' into feature/runner-lock-on-projectLin Jen-Shin2016-06-141-2/+5
| |\ \ \
| | * | | Give 409 Conflict whenever the runner was already enabledprefer-assign_toLin Jen-Shin2016-06-141-2/+5
| | * | | Prefer Runner#assign_to instead of creating directlyLin Jen-Shin2016-06-141-1/+1
| * | | | Merge branch 'master' into feature/runner-lock-on-projectLin Jen-Shin2016-06-145-12/+30
| |\ \ \ \ | | |/ / /
| * | | | Avoid enabling locked runners. Give 403 in this caseLin Jen-Shin2016-06-141-0/+1
| * | | | WIP, try to add views for locked runnersLin Jen-Shin2016-06-092-1/+2
* | | | | Remove explicit Gitlab::Metrics.action assignments, are already automatic.18760-remove-explicate-assignment-on-metrics-actionPaco Guzman2016-06-181-2/+0
| |_|_|/ |/| | |
* | | | Add endpoints for award emoji on notesZ.J. van de Weg2016-06-172-69/+83
* | | | Sort API endpoints and implement feedbackZ.J. van de Weg2016-06-174-35/+40
* | | | Add endpoints for Award EmojiZ.J. van de Weg2016-06-174-1/+107
* | | | Added missing mount point for Sidekiq Metrics API, after it got lost on rebase.Patricio Cano2016-06-171-0/+1
* | | | Fixed Rubocop errorPatricio Cano2016-06-171-0/+90
* | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-163-6/+23
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| | |/ / / | |/| | |
* | | | | Implement @DouweM's feedback.Timothy Andrew2016-06-161-11/+3
* | | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-145-12/+30
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-097-20/+27
|\ \ \ \ | |/ / /
| * | | 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
View Lorry Controller Status