summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Simplify pattern lexeme fabrication and matcherfeature/gb/add-regexp-variables-expressionGrzegorz Bizon2018-05-181-2/+2
|
* 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
|\ | | | | | | | | | | | | * master: (76 commits) Conflicts: lib/gitlab/untrusted_regexp.rb
| * Merge branch 'blackst0ne-remove-spinach' into 'master'Rémy Coutable2018-05-152-61/+0
| |\ | | | | | | | | | | | | | | | | | | Remove Spinach Closes #23036 See merge request gitlab-org/gitlab-ce!18869
| | * 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 implementation See merge request gitlab-org/gitlab-ce!18938
| | * | 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
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | An LDAP sign-in request results in a different request parameter than a standard GitLab sign-in. Since Warden doesn't pass us the user that was blocked, we first search for a `username` in the request parameters and then look for `user.login`. Closes #46307
| * | Merge branch 'rd-remove-duplicate-method' into 'master'Robert Speicher2018-05-111-5/+0
| |\ \ | | | | | | | | | | | | | | | | Remove duplicate method See merge request gitlab-org/gitlab-ce!18886
| | * | 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
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block access to API & git when terms are enforced Closes #45849 See merge request gitlab-org/gitlab-ce!18816
| | * | | Allow triggered builds git accessBob Van Landuyt2018-05-112-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Allow builds that have been triggered by a user before terms were enforced access to git. That way the builds can complete as usual.
| | * | | Block access to API & git when terms are enforcedBob Van Landuyt2018-05-103-5/+46
| | |/ / | | | | | | | | | | | | | | | | | | | | When terms are enforced, but the user has not accepted the terms access to the API & git is rejected with a message directing the user to the web app to accept the terms.
| * | | Merge branch 'zj-remove-repo-path-strip-storage-path' into 'master'Douwe Maan2018-05-111-17/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Remove Gitlab::RepoPath.strip_storage_path See merge request gitlab-org/gitlab-ce!18904
| | * | | Remove Gitlab::RepoPath.strip_storage_pathZeger-Jan van de Weg2018-05-111-17/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | This used to be executed because of the post receive worker, but this uses Gitlab::GlRepository.parse now. So this removes dead code and reduces the number of calls on `#legacy_storage_path`.
| * | | Merge branch 'zj-wiki-find-file-opt-out' into 'master'Douwe Maan2018-05-111-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki Find Page to opt_out Closes gitaly#894 See merge request gitlab-org/gitlab-ce!18895
| | * | | Wiki Find Page to opt_outZeger-Jan van de Weg2018-05-111-1/+2
| | | |/ | | |/| | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/894
| * | | Merge branch '46233-rails5-fix-nomethoderror-undefined-method-for-3-string' ↵Douwe Maan2018-05-111-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "[Rails5] Fix `NoMethodError: undefined method `-' for "3":String`" Closes #46233 See merge request gitlab-org/gitlab-ce!18892
| | * | [Rails5] Fix `per_page` in lib/gitlab/multi_collection_paginator.rb46233-rails5-fix-nomethoderror-undefined-method-for-3-stringblackst0ne2018-05-111-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5 the `per_page` argument came from `params` is String but an Integer is expected. This commit explicitly converts `per_page` to an Integer. It fixes the errors like: ``` 1) Groups::ChildrenController GET #index for subgroups filtering children succeeds if multiple pages contain matching subgroups Failure/Error: hash[page] = second_collection.page(second_collection_page) .per(per_page - paginated_first_collection(page).size) .padding(offset) NoMethodError: undefined method `-' for "3":String Did you mean? -@ # ./lib/gitlab/multi_collection_paginator.rb:42:in `block in paginated_second_collection' # ./lib/gitlab/multi_collection_paginator.rb:46:in `paginated_second_collection' # ./lib/gitlab/multi_collection_paginator.rb:14:in `paginate' # ./app/finders/group_descendants_finder.rb:52:in `children' # ./app/finders/group_descendants_finder.rb:34:in `execute' # ./app/controllers/groups/children_controller.rb:36:in `setup_children' # ./app/controllers/groups/children_controller.rb:18:in `index' # ./lib/gitlab/i18n.rb:50:in `with_locale' # ./lib/gitlab/i18n.rb:56:in `with_user_locale' # ./app/controllers/application_controller.rb:351:in `set_locale' # ./spec/controllers/groups/children_controller_spec.rb:182:in `block (5 levels) in <top (required)>' # ./spec/spec_helper.rb:198:in `block (2 levels) in <top (required)>' ```
* | | 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 method See merge request gitlab-org/gitlab-ce!18815
| * Remove method call to deprecated methodZeger-Jan van de Weg2018-05-111-1/+10
| | | | | | | | | | Given the settings initializer creates Gitaly Storage Settings objects already, the calls to path can be moved to that initializer.
* | Merge branch 'sh-reset-prometheus-metrics-tests' into 'master'Nick Thomas2018-05-101-0/+8
|\ \ | | | | | | | | | | | | | | | | | | Support resetting of Prometheus metrics between test runs Closes #39968 See merge request gitlab-org/gitlab-ce!18836
| * | Support resetting of Prometheus metrics between test runsStan Hu2018-05-091-0/+8
| |/ | | | | | | | | | | | | Adding the :prometheus tag to an rspec test will clear out memory-mapped files and reset the registry. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39968
* | Merge branch ↵Douwe Maan2018-05-103-16/+34
|\ \ | | | | | | | | | | | | | | | | | | 'backport-rd-5566-improve-performance-of-repository-size-limit-check' into 'master' Backport some changes from gitlab-ee!5476 See merge request gitlab-org/gitlab-ce!18760
| * | Backport some changes from gitlab-ee!5476Rubén Dávila2018-05-093-16/+34
| | | | | | | | | | | | | | | The lib/gitlab/git/repository.rb needs to have the same content between gitlab-ce and gitlab-ee in order to have Gitaly working fine.
* | | Merge branch 'dm-repository-xcode-project' into 'master'Robert Speicher2018-05-091-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Add Repository#xcode_project? method See merge request gitlab-org/gitlab-ce!18854
| * | | 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 controller See merge request gitlab-org/gitlab-ce!18817
| * | Remove rugged call in blame controllerZeger-Jan van de Weg2018-05-081-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | Fetching commits through #lookup uses rugged, and this is phased out. Also adds a short circuit in the `feature_enabled?` Gitaly method to allow Gitaly to be used when objects are set up with `let` before an example is run.
* | | 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
|\ \ | |/ |/| | | | | | | | | 'master' Raise InvalidRepository error for non-valid git repositories See merge request gitlab-org/gitlab-ce!18594
| * 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
| | | | | | | | Signed-off-by: Lars Greiss <l.greiss@mediacologne.de>
* | Merge branch '5480-epic-notifications-ce' into 'master'Douwe Maan2018-05-072-3/+8
|\ \ | | | | | | | | | | | | Backport 5480-epic-notifications from EE See merge request gitlab-org/gitlab-ce!18724
| * | 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
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Upgrade to Webpack 4 Closes #43400 See merge request gitlab-org/gitlab-ce!17218
| * | Merge branch 'master' into upgrade-to-webpack-v4Mike Greiling2018-05-0721-63/+217
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (252 commits) Upgrade underscore.js Enable prometheus metrics by default Add signature verification badge to compare view Add Changelog Update instalation from source guide fix Web IDE file tree scroll issue Enable quick support actions default Backport of 4084-epics-username-autocomplete Remove top margin on the terms page with performance bar Backports every CE related change from ee-44542 to CE Fix typo in changelog entry fix missing space Backport IdentityLinker#failed? from GroupSaml callback flow Add ci_cd_settings delete_all dependency on project AutoDevOps Docs fix invalid external link Ignore knapsack and rspec_flaky Ensure web hook 'blocked URL' errors are stored in as web hook logs and properly surfaced to the user Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runner pages Reuses `InternalRedirect` when possible Enforces terms in the web application ...