summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Migration to add/drop primary key constraints for composite keys.ab-43706-composite-primary-keysAndreas Brandl2018-05-211-0/+15
| | | | Closes #43706.
* Merge branch 'create-live-trace-only-if-job-is-complete' into 'master'Kamil Trzciński2018-05-211-0/+1
|\ | | | | | | | | | | | | Append trace chunk only if job is running Closes #46383 See merge request gitlab-org/gitlab-ce!18969
| * Add the same gurad clause with artifacts uplaodingShinya Maeda2018-05-211-1/+2
| |
| * Append trace only if the job is runningShinya Maeda2018-05-211-1/+1
| |
* | Merge branch '45528-repeated-calls-to-redis-for-flipper-feature-flag' into ↵Stan Hu2018-05-211-1/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Repeated calls to Redis for Flipper feature flag" Closes #45528 See merge request gitlab-org/gitlab-ce!18490
| * | Ensure Flipper memoizer is used in Sidekiq's context45528-repeated-calls-to-redis-for-flipper-feature-flagRémy Coutable2018-05-181-1/+16
| | | | | | | | | | | | | | | | | | | | | Also, don't use the provided Middleware, which isn't thread-safe, and instantiate a new Flipper instance per thread instead. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '44799-api-naming-issue-scope' into 'master'Rémy Coutable2018-05-212-8/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API naming for issue scope" Closes #44799 See merge request gitlab-org/gitlab-ce!18935
| * | | Add created_by_me and assigned_to_me scopes44799-api-naming-issue-scopeMark Chao2018-05-212-8/+10
| | | | | | | | | | | | | | | | Deprecate corresponding dash versions created-by-me and assigned-to-me
* | | | Merge branch 'zj-workhorse-archive-mandatory' into 'master'Grzegorz Bizon2018-05-212-8/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Move git archives downloading to Gitaly See merge request gitlab-org/gitlab-ce!18990
| * | | Move git archives downloading to GitalyZeger-Jan van de Weg2018-05-172-8/+3
| | | |
* | | | Merge branch 'xeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refs' into ↵Grzegorz Bizon2018-05-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix error when deleting an empty list of refs Closes #45743 See merge request gitlab-org/gitlab-ce!19053
| * | | | Fix error when deleting an empty list of refsxeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refsSergey Sinev2018-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | Closes #45743
* | | | | Merge branch '46498-do-not-modify-strings' into 'master'Stan Hu2018-05-192-11/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Blob#batch can't handle frozen string paths" Closes #46498 See merge request gitlab-org/gitlab-ce!19039
| * | | | | Fix a RuntimeError: cannot modify frozen stringNick Thomas2018-05-182-11/+11
| | | | | |
* | | | | | Fix double brackets being linkified in wiki markdownAlex2018-05-181-0/+3
| | | | | |
* | | | | | Merge branch 'fix/handle-large-commit-tag-message' into 'master'Robert Speicher2018-05-188-28/+187
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add handling for commit/tags with big messages See merge request gitlab-org/gitlab-ce!17892
| * | | | | | Add handling for commit/tags with big messagesAhmad Sherif2018-05-188-28/+187
| |/ / / / /
* | | | | | Merge branch 'gitaly-1182-search-by-content-name' into 'master'Robert Speicher2018-05-182-5/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Repo#search_by_{content,name} to Gitaly See merge request gitlab-org/gitlab-ce!18750
| * | | | | | Migrate RepositoryService#SearchFilesBy{Content,Name}gitaly-1182-search-by-content-nameKim "BKC" Carlbäcker2018-05-182-5/+31
| | | | | | |
* | | | | | | Merge branch '5913-extract-ee-specific-lines-for-lib-gitlab-auth' into 'master'Robert Speicher2018-05-185-20/+59
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | [CE] Resolve "Extract EE specific files/lines for lib/gitlab/auth" See merge request gitlab-org/gitlab-ce!19037
| * | | | | | Minimize CE/EE difference in Gitlab::Auth::LDAP::ConfigRémy Coutable2018-05-181-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Minimize CE/EE difference in Gitlab::Auth::LDAP::AccessRémy Coutable2018-05-181-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Minimize CE/EE difference in Gitlab::Auth::UserAuthFindersRémy Coutable2018-05-181-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Minimize CE/EE difference in Gitlab::Auth::Saml::UserRémy Coutable2018-05-181-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Minimize CE/EE difference in Gitlab::Auth::Saml::ConfigRémy Coutable2018-05-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'zj-calculate-checksum-mandator' into 'master'Nick Thomas2018-05-181-38/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calculating repository checksums executed by Gitaly Closes gitaly#1105 and #46293 See merge request gitlab-org/gitlab-ce!18907
| * | | | | | | Calculating repository checksums executed by GitalyZeger-Jan van de Weg2018-05-181-38/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OPT_OUT status has been removed, and alternative implementation removed. Also checks if the repository exists before executing the checksum RPC to guard against NotFound errors. Closes gitlab-org/gitaly#1105
* | | | | | | | Merge branch 'memoize-database-version' into 'master'Rémy Coutable2018-05-181-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Memoize Gitlab::Database.version See merge request gitlab-org/gitlab-ce!19021
| * | | | | | | Memoize Gitlab::Database.versionmemoize-database-versionYorick Peterse2018-05-171-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for running a database query every time we want to check the database version.
* | | | | | | Merge branch 'feature/gb/add-regexp-variables-expression' into 'master'Kamil Trzciński2018-05-186-7/+108
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for variables expression regexp syntax Closes #43601 See merge request gitlab-org/gitlab-ce!18902
| * | | | | | | 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
| * | | | | | | | 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 'ccr/regexp_anchor' into 'master'Kamil Trzciński2018-05-181-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add anchor for incoming email regex, closes 44989 See merge request gitlab-org/gitlab-ce!18917
| * | | | | | | | | Add anchor for incoming email regex, closes 44989ccr/regexp_anchorChantal Rollison2018-05-111-1/+1
| | | | | | | | | |
* | | | | | | | | | Resolve "Expand API: Render an arbitrary Markdown document"blackst0ne2018-05-184-3/+37
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'sh-fix-grape-logging-status-code' into 'master'Douwe Maan2018-05-181-8/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix api_json.log not always reporting the right HTTP status code See merge request gitlab-org/gitlab-ce!19028
| * | | | | | | | Fix api_json.log not always reporting the right HTTP status codeStan Hu2018-05-171-8/+9
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As described in https://github.com/aserafin/grape_logging/issues/45, if a Grape error is caught by the handlers and a different return code is returned, then the api_json.log would have a 500 error code instead of the right value. Inserting the GrapeLogging middleware after the Grape middleware fixes this problem. Seen in https://gitlab.com/gitlab-com/infrastructure/issues/4249
View Lorry Controller Status