summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Resolve "Forking with namespace doesn't work (API)"Jan2018-03-262-10/+2
|
* Updated grape to `1.0.2` to remove workaround40843-update-grape-to-v1-0-2-when-it-is-releasedJames Edwards-Jones2018-03-261-6/+1
|
* Merge branch ↵Stan Hu2018-03-234-10/+18
|\ | | | | | | | | | | | | | | | | '44564-error-500-while-attempting-to-resolve-conflicts-due-to-utf-8-conversion-error' into 'master' Resolve "Error 500 while attempting to resolve conflicts due to UTF-8 conversion error" Closes #44564 See merge request gitlab-org/gitlab-ce!17962
| * Fix 500 error when trying to resolve non-ASCII conflicts in editorSean McGivern2018-03-234-10/+18
| | | | | | | | | | | | | | | | | | When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't always call `lines`, which meant that we didn't get the benefit of the side-effect from that, where it forced the conflict data itself to UTF-8. To fix that, make this explicit by separating the `raw_content` (any encoding) from the `content` (which is either UTF-8, or an exception is raised).
* | Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master'Robert Speicher2018-03-231-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix EncodingHelper#clean blowing up on UTF-16BE strings Closes gitaly#1101 See merge request gitlab-org/gitlab-ce!17943
| * | Fix EncodingHelper#clean blowing up on UTF-16BE stringsfix/encoding-helper-clean-blowing-up-on-utf-16beAhmad Sherif2018-03-221-1/+1
| | | | | | | | | | | | Closes gitaly#1101
* | | Add ?, !, and : to trailing puncutation excluded from auto-linkingSean McGivern2018-03-231-5/+6
| |/ |/|
* | Merge branch 'jprovazn-issueref' into 'master'Douwe Maan2018-03-231-1/+9
|\ \ | | | | | | | | | | | | | | | | | | Fix issuable state indicator Closes gitlab-ee#4683 See merge request gitlab-org/gitlab-ce!17878
| * | Fix issuable state indicatorJan Provaznik2018-03-231-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the issuable reference check works only in project scope, if we reference an issuable from a non-project resource (e.g. epics), then project is not set, and there is mismatch in generated issue references. This patch enables issuable reference state check also from group scope. Closes gitlab-ee#4683 Related to #30916
* | | Merge branch 'mark-legacy-git-access' into 'master'Sean McGivern2018-03-2317-27/+64
|\ \ \ | |/ / |/| | | | | | | | Route path lookups through legacy_disk_path See merge request gitlab-org/gitlab-ce!17743
| * | Route path lookups through legacy_disk_pathmark-legacy-git-accessJacob Vosmaer2018-03-2117-27/+64
| | |
* | | Merge branch 'ci-pipeline-commit-lookup' into 'master'Kamil Trzciński2018-03-221-4/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Use porcelain commit lookup method on CI::CreatePipelineService Closes charts/helm.gitlab.io#291 See merge request gitlab-org/gitlab-ce!17911
| * | Use porcelain commit lookup method on CI::CreatePipelineServiceci-pipeline-commit-lookupAlejandro Rodríguez2018-03-221-4/+4
| | | | | | | | | | | | | | | Before we were using a "plumbing" Gitlab::Git method that does not go through Gitaly migration checking.
* | | Merge branch 'latest-security-to-master-21-03-18' into 'master'Douwe Maan2018-03-225-21/+76
|\ \ \ | | | | | | | | | | | | | | | | Introduce latest security changes to `master` See merge request gitlab-org/gitlab-ce!17905
| * \ \ Merge branch 'master' into 'latest-security-to-master-21-03-18'James Lopez2018-03-226-33/+137
| |\ \ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock
| * | | | Fixing request options to allow_local_requests with DELETE verblatest-security-to-master-21-03-18Francisco Javier López2018-03-211-1/+1
| | | | |
| * | | | Adapting mattermost to the new way of calling HTTPFrancisco Javier López2018-03-211-1/+1
| | | | |
| * | | | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-215-20/+75
| | |/ / | |/| | | | | | | | | | | | | | Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2337
* | | | Merge branch 'fix/remove-wiki-cache-clear' into 'master'Sean McGivern2018-03-221-3/+0
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Remove calls to clear_cache from Git::Wiki Closes gitaly#1095 See merge request gitlab-org/gitlab-ce!17914
| * | | Remove calls to clear_cache from Git::Wikifix/remove-wiki-cache-clearAhmad Sherif2018-03-211-3/+0
| |/ / | | | | | | | | | | | | | | | | | | They were probably added to compensate for tests shortcomings, but now they don't complain. Closes gitaly#1095
* | | Merge branch 'sh-fix-readonly-reload' into 'master'Sean McGivern2018-03-221-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fix "A copy of Gitlab::Middleware::Readonly has been removed from the module See merge request gitlab-org/gitlab-ce!17925
| * | | Fix "A copy of Gitlab::Middleware::Readonly has been removed from the module ↵Stan Hu2018-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | tree but is still active" Similar to #34047 and #29327
* | | | Merge branch 'jej/omniauth-initializer-refactor' into 'master'Douwe Maan2018-03-221-0/+75
|\ \ \ \ | |/ / / |/| | | | | | | | | | | OmniauthInitializer created to allow testing/refactoring of code from devise.rb See merge request gitlab-org/gitlab-ce!17881
| * | | OmniauthInitializer refactoringjej/omniauth-initializer-refactorJames Edwards-Jones2018-03-221-33/+31
| | | |
| * | | Omniauth callbacks moved to methodsJames Edwards-Jones2018-03-201-26/+38
| | | |
| * | | OmniauthInitializer created to improve devise.rbJames Edwards-Jones2018-03-201-0/+65
| | | | | | | | | | | | | | | | This should simplify refactoring and allow testing
* | | | Merge branch 'add-query-counts-to-profiler-output' into 'master'Stan Hu2018-03-221-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add query counts by model to profiler output See merge request gitlab-org/gitlab-ce!17910
| * | | | Add query counts by model to profiler outputadd-query-counts-to-profiler-outputSean McGivern2018-03-211-4/+8
| | |/ / | |/| |
* | | | Merge branch 'remove-parser-warnings-workaround' into 'master'Robert Speicher2018-03-211-9/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove parser warnings workaround See merge request gitlab-org/gitlab-ce!17901
| * | | | It's now updated so we could remove itLin Jen-Shin2018-03-211-9/+0
| |/ / / | | | | | | | | | | | | | | | | Updated in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17673
* | | | Merge branch 'gitaly-upload-archive' into 'master'Sean McGivern2018-03-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send Gitaly payload for git-upload-archive SSH commands Closes gitaly#1092 See merge request gitlab-org/gitlab-ce!17903
| * | | | Send Gitaly payload for git-upload-archive SSH commandsAlejandro Rodríguez2018-03-211-1/+1
| |/ / /
* | | | Shortcut concurrent foreign key creation if already exists.ab-43887-concurrent-migration-helpersAndreas Brandl2018-03-201-18/+37
| | | | | | | | | | | | | | | | Closes #43887.
* | | | Shortcut concurrent index creation/removal if no effect.Andreas Brandl2018-03-201-0/+15
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Index creation does not have an effect if the index is present already. Index removal does not have an affect if the index is not present. This helps to avoid patterns like this in migrations: ``` if index_exists?(...) remove_concurrent_index(...) end ```
* | | Merge branch '44280-fix-code-search' into 'master'Sean McGivern2018-03-202-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Search code blob sometimes shows filename and branch" Closes #44280 See merge request gitlab-org/gitlab-ce!17777
| * | | Split repository search result on \n instead of $ to prevent the items of ↵Jasper Maes2018-03-192-2/+2
| | | | | | | | | | | | | | | | the array to start with a newline. Remove the strip from parsing the search result to keep result endlines.
* | | | Merge branch 'issue_25542' into 'master'Sean McGivern2018-03-201-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Improve JIRA event descriptions Closes #25542 See merge request gitlab-org/gitlab-ce!17811
| * | | Improve JIRA event descriptionsissue_25542Felipe Artur2018-03-191-1/+1
| | | |
* | | | move render_gfm into behaviors directoryMike Greiling2018-03-191-2/+2
| | | |
* | | | Merge branch 'ajax-requests-in-performance-bar' into 'master'Robert Speicher2018-03-191-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show Ajax requests in performance bar Closes #43925 See merge request gitlab-org/gitlab-ce!17742
| * | | | Show Ajax requests in performance barSean McGivern2018-03-191-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But first, rewrite the performance bar in Vue: 1. Remove the peek-host gem and replace it with existing code. This also allows us to include the host in the JSON response, rather than in the page HTML. 2. Leave the line profiler parts as here-be-dragons: nicer would be a separate endpoint for these, so we could use them on Ajax requests too. 3. The performance bar is too fiddly to rewrite right now, so apply the same logic to that. Then, add features! All requests made through Axios are able to be tracked. To keep a lid on memory usage, only the first two requests for a given URL are tracked, though. Each request that's tracked has the same data as the initial page load, with the exception of the performance bar and the line profiler, as explained above.
* | | | | Optional '/-/' delimiter for search APIJan Provaznik2018-03-191-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '/-/' delimiter is used only in UI, in API we don't use it for other endpoints. To align search endpoints with the rest of API endpoints, this patch makes '/-/' optional for existing endpoints (to keep backward compatibility). Documentation is updated to prefer paths without '/-/'.
* | | | Merge branch ↵Douwe Maan2018-03-191-18/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binary' into 'master' Resolve "Viewing a particular commit gives 500 error ~ Error (undefined method `binary?')" Closes #44257 See merge request gitlab-org/gitlab-ce!17805
| * | | | Ensure that we never assume old_blob or new_blob are nil44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binarySean McGivern2018-03-161-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | | These can be a `BatchLoader` which is proxying a nil, while not being concrete nils themselves.
* | | | | Merge branch 'master' into 'update-kubeclient'Grzegorz Bizon2018-03-1724-36/+335
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Conflicts: Gemfile.lock
| * | | | | Fix "A copy of Gitlab::Metrics::Methods" have been removed errorStan Hu2018-03-161-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Closes #44365
| * | | | Merge branch ↵Grzegorz Bizon2018-03-163-4/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41902-add-api-option-to-overwrite-project-description-on-project-export' into 'master' Resolve "Extend API for exporting a project with option to overwrite project description" Closes #41902 and #34936 See merge request gitlab-org/gitlab-ce!17744
| | * | | | Adds the option to override project description on export via APITiago Botelho2018-03-163-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | and fixes the project description not being imported
| * | | | | Merge branch '44126-setup-middleware-before-adapter' into 'master'Kamil Trzciński2018-03-161-2/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate Faraday warnings Closes #44126 See merge request gitlab-org/gitlab-ce!17795
| | * | | | Setup Faraday middleware before adapterLin Jen-Shin2018-03-161-2/+3
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | This eliminate the warnings: WARNING: Unexpected middleware set after the adapter. This won't be supported from Faraday 1.0.
View Lorry Controller Status