summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix builds API response not including commit dataGrzegorz Bizon2016-06-211-5/+1
* Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-2110-134/+209
|\
| * fixup! override content methodZ.J. van de Weg2016-06-204-21/+20
| * Incorporate reviewZ.J. van de Weg2016-06-204-11/+19
| * Run rake gitlab:update_templatesZ.J. van de Weg2016-06-201-1/+1
| * Add changelog item, fix rubocop issueZ.J. van de Weg2016-06-201-1/+1
| * Implement backend gitlab ci dropdownZ.J. van de Weg2016-06-205-47/+73
| * Refactor Gitlab::GitignoresZJ van de Weg2016-06-209-134/+176
* | Merge branch 'feature/runner-lock-on-project' into 'master' Rémy Coutable2016-06-213-9/+13
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-2044-123/+1504
| |\ \ | | |/
| * | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-1732-122/+542
| |\ \
| * | | 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-1421-139/+232
| |\ \ \ \ | | |/ / /
| * | | | Avoid enabling locked runners. Give 403 in this caseLin Jen-Shin2016-06-141-0/+1
| * | | | Prefer attributes_for_keys so that it ignores nilsLin Jen-Shin2016-06-091-7/+3
| * | | | WIP, try to add views for locked runnersLin Jen-Shin2016-06-093-2/+4
* | | | | Merge branch '18760-remove-explicate-assignment-on-metrics-action' into 'mast...Yorick Peterse2016-06-211-2/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove explicit Gitlab::Metrics.action assignments, are already automatic.18760-remove-explicate-assignment-on-metrics-actionPaco Guzman2016-06-181-2/+0
* | | | | Merge branch 'limit-email-diff-size' into 'master' Robert Speicher2016-06-201-1/+1
|\ \ \ \ \
| * | | | | Limit push email diff sizelimit-email-diff-sizeSean McGivern2016-06-171-1/+1
| | |_|_|/ | |/| | |
* | | | | use rails root joinJames Lopez2016-06-201-1/+1
* | | | | fixed a couple of errors spotted in productionJames Lopez2016-06-201-1/+1
* | | | | Merge branch 'fix-out-of-bounds-markdown-refs' into 'master' Robert Speicher2016-06-182-1/+7
|\ \ \ \ \
| * | | | | Fix RangeError exceptions when referring to issues or merge requests outside ...Stan Hu2016-06-182-1/+7
| | |/ / / | |/| | |
* | | | | Fix bug in `WikiLinkFilter`.18819-wiki-link-filter-exceptionTimothy Andrew2016-06-181-1/+1
|/ / / /
* | | | Merge branch 'gh-webhooks' into 'master' Robert Speicher2016-06-171-5/+18
|\ \ \ \
| * | | | Listing GH Webhooks doesn't stop import process for non GH admin usersDouglas Barbosa Alexandre2016-06-171-5/+18
* | | | | 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
|/ / / /
* | | | Merge branch 'track-total-method-call-time' into 'master' Robert Speicher2016-06-173-22/+84
|\ \ \ \
| * | | | Track method call times/counts as a single metricYorick Peterse2016-06-173-22/+84
* | | | | Merge branch 'sidekiq-api-metrics' into 'master' Achilleas Pipinellis2016-06-172-0/+91
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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 branch 'registry-500-fix' into 'master' Rémy Coutable2016-06-171-3/+8
|\ \ \ \ \
| * | | | | Use response_bodyKamil Trzcinski2016-06-171-6/+7
| * | | | | Fix regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_re...registry-500-fixKamil Trzcinski2016-06-171-3/+7
| | |/ / / | |/| | |
* | | | | Merge branch 'secure-request-uris' into 'master' Yorick Peterse2016-06-171-1/+5
|\ \ \ \ \
| * | | | | Filter out sensitive parameters of metrics dataPaco Guzman2016-06-171-1/+5
| | |/ / / | |/| | |
* | | | | Merge branch 'update-column-in-batches-where' into 'master' Robert Speicher2016-06-171-52/+67
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix update_column_in_batches to update all rowsYorick Peterse2016-06-171-23/+27
| * | | | Don't update columns in batches in a transactionYorick Peterse2016-06-151-4/+2
| * | | | Customizing of update_column_in_batches queriesYorick Peterse2016-06-151-41/+54
* | | | | Merge branch 'feature/project-export' into 'master' Douwe Maan2016-06-1725-5/+1044
|\ \ \ \ \
| * | | | | a few changes based on MR feedbackJames Lopez2016-06-171-1/+1
| * | | | | fixed merge conflicts on UI branchJames Lopez2016-06-1632-118/+493
| |\ \ \ \ \
View Lorry Controller Status