summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Simplify untrusted regexp factory methodGrzegorz Bizon2018-05-181-9/+6
* Add variables expression pattern validation supportGrzegorz Bizon2018-05-171-0/+4
* Add anti-corruption layer above expressions pattern matchingGrzegorz Bizon2018-05-171-2/+2
* Add extended /regexp/ scheme support to untrusted regexpGrzegorz Bizon2018-05-171-0/+23
* Remove useless assignment in pattern lexemeGrzegorz Bizon2018-05-151-1/+1
* Do not support inverse variable pattern matchingGrzegorz Bizon2018-05-151-2/+1
* Add support for pattern matching in variables expressionsGrzegorz Bizon2018-05-154-3/+9
* Reorganize exceptions in pipeline expressions moduleGrzegorz Bizon2018-05-155-9/+16
* Merge branch 'master' into feature/gb/add-regexp-variables-expressionGrzegorz Bizon2018-05-1512-93/+89
|\
| * Merge branch 'blackst0ne-remove-spinach' into 'master'Rémy Coutable2018-05-152-61/+0
| |\
| | * Clean up test.rakeblackst0ne2018-05-141-1/+0
| | * Remove spinach.rakeblackst0ne2018-05-141-60/+0
| * | Merge branch 'backstage/gb/backport-untrusted-regexp-ee-code' into 'master'Rémy Coutable2018-05-141-1/+18
| |\ \
| | * | Backport EE-specific untrusted regexp implementationGrzegorz Bizon2018-05-141-1/+18
| * | | Fix system hook not firing for blocked users when LDAP sign-in is usedStan Hu2018-05-121-1/+3
| | |/ | |/|
| * | Merge branch 'rd-remove-duplicate-method' into 'master'Robert Speicher2018-05-111-5/+0
| |\ \
| | * | Remove duplicate methodRubén Dávila2018-05-101-5/+0
| * | | Merge branch 'bvl-restrict-api-git-for-terms' into 'master'Douwe Maan2018-05-114-6/+63
| |\ \ \
| | * | | Allow triggered builds git accessBob Van Landuyt2018-05-112-1/+17
| | * | | Block access to API & git when terms are enforcedBob Van Landuyt2018-05-103-5/+46
| | |/ /
| * | | Merge branch 'zj-remove-repo-path-strip-storage-path' into 'master'Douwe Maan2018-05-111-17/+2
| |\ \ \
| | * | | Remove Gitlab::RepoPath.strip_storage_pathZeger-Jan van de Weg2018-05-111-17/+2
| | | |/ | | |/|
| * | | Merge branch 'zj-wiki-find-file-opt-out' into 'master'Douwe Maan2018-05-111-1/+2
| |\ \ \
| | * | | Wiki Find Page to opt_outZeger-Jan van de Weg2018-05-111-1/+2
| | | |/ | | |/|
| * | | Merge branch '46233-rails5-fix-nomethoderror-undefined-method-for-3-string' i...Douwe Maan2018-05-111-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | [Rails5] Fix `per_page` in lib/gitlab/multi_collection_paginator.rb46233-rails5-fix-nomethoderror-undefined-method-for-3-stringblackst0ne2018-05-111-1/+1
| | |/
* | | Add pattern matching variables expression lexemeGrzegorz Bizon2018-05-141-0/+29
* | | Raise variables statement exception if pattern is invalidGrzegorz Bizon2018-05-142-2/+6
* | | Do not raise if variable expression can not be evaluatedGrzegorz Bizon2018-05-141-0/+2
* | | Implement variables expression untrusted pattern lexemeGrzegorz Bizon2018-05-111-0/+26
* | | Make it possible to compare untrusted regexpsGrzegorz Bizon2018-05-111-1/+5
|/ /
* | Merge branch 'zj-validation-initializer' into 'master'Kamil Trzciński2018-05-111-1/+10
|\ \ | |/ |/|
| * Remove method call to deprecated methodZeger-Jan van de Weg2018-05-111-1/+10
* | Merge branch 'sh-reset-prometheus-metrics-tests' into 'master'Nick Thomas2018-05-101-0/+8
|\ \
| * | Support resetting of Prometheus metrics between test runsStan Hu2018-05-091-0/+8
| |/
* | Merge branch 'backport-rd-5566-improve-performance-of-repository-size-limit-c...Douwe Maan2018-05-103-16/+34
|\ \
| * | Backport some changes from gitlab-ee!5476Rubén Dávila2018-05-093-16/+34
* | | Merge branch 'dm-repository-xcode-project' into 'master'Robert Speicher2018-05-091-0/+1
|\ \ \
| * | | Add Repository#xcode_project? methodDouwe Maan2018-05-091-0/+1
| | |/ | |/|
* | | Merge branch 'zj-remove-rugged-call' into 'master'Robert Speicher2018-05-091-7/+3
|\ \ \ | |_|/ |/| |
| * | Remove rugged call in blame controllerZeger-Jan van de Weg2018-05-081-7/+3
* | | Support 'active' setting on Runner Registration API endpointTomasz Maczukin2018-05-091-1/+2
| |/ |/|
* | Merge branch '5750-backport-checksum-git-commanderror-exit-status-128' into '...Stan Hu2018-05-082-4/+9
|\ \ | |/ |/|
| * Raise InvalidRepository error for non-valid git repositoriesDouglas Barbosa Alexandre2018-05-072-4/+9
* | Expose runner ip address to runners APILars Greiss2018-05-081-0/+1
* | Merge branch '5480-epic-notifications-ce' into 'master'Douwe Maan2018-05-072-3/+8
|\ \
| * | Backport 5480-epic-notifications from EEMario de la Ossa2018-05-072-3/+8
* | | Merge branch 'upgrade-to-webpack-v4' into 'master'Clement Ho2018-05-072-2/+29
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' into upgrade-to-webpack-v4Mike Greiling2018-05-0721-63/+217
| |\ \
| * | | remove unused methods until neededMike Greiling2018-05-071-22/+0