summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'zj-find-all-commits' into 'master'Douwe Maan2018-06-281-49/+2
|\ | | | | | | | | | | | | FindAllCommits mandatory Closes gitaly#326 See merge request gitlab-org/gitlab-ce!20242
| * FindAllCommits mandatoryZeger-Jan van de Weg2018-06-281-49/+2
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/326
* | Merge branch 'zj-commits-between-mandatory' into 'master'Douwe Maan2018-06-282-29/+2
|\ \ | | | | | | | | | | | | | | | | | | Commits between in Gitaly only Closes gitaly#315 See merge request gitlab-org/gitlab-ce!20239
| * | Commits between in Gitaly onlyZeger-Jan van de Weg2018-06-282-29/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, most the commits counted were done through Gitaly. This removes the last point where this wasn't the case. This makes the `rugged_count_commits` method obsolete, with its tests. Closes https://gitlab.com/gitlab-org/gitaly/issues/315
* | | Merge branch 'bvl-graphql-permissions' into 'master'Sean McGivern2018-06-282-1/+25
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | expose permissions on types Closes #47695 See merge request gitlab-org/gitlab-ce!20152
| * | Expose permissions on types in GraphQLBob Van Landuyt2018-06-282-1/+25
| | | | | | | | | | | | | | | This adds a reusable way to expose permissions for a user to types in GraphQL.
* | | Merge branch 'straight-comparision-mode' into 'master'Sean McGivern2018-06-281-1/+2
|\ \ \ | | | | | | | | | | | | | | | | Allow straight diff in Compare API See merge request gitlab-org/gitlab-ce!20120
| * | | Allow straight diff in Compare APIMaciej Nowak2018-06-281-1/+2
| | | | | | | | | | | | | | | | Repository compare API now allows choosing straight (from..to) or merge-base diff (from...to)
* | | | Merge branch 'db-configure-after-drop-tables' into 'master'Douwe Maan2018-06-281-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes an issue where migrations instead of schema loading were run Closes #48564 See merge request gitlab-org/gitlab-ce!20227
| * | | | Fixes an issue where migrations instead of schema loading were runDJ Mountney2018-06-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | If you called rake gitlab:db:drop_tables before running gitlab-ctl reconfigure (or rake gitlab:db:configure)
* | | | | Merge branch 'gitaly-mandatory-20180627-jv-2' into 'master'Douwe Maan2018-06-282-47/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Gitaly signature RPC's mandatory Closes gitaly#745, gitaly#1044, and gitaly#876 See merge request gitlab-org/gitlab-ce!20212
| * | | | | Make Gitaly signature RPC's mandatoryJacob Vosmaer2018-06-272-47/+6
| | | | | |
* | | | | | Merge branch 'gitaly-mandatory-20180627-jv' into 'master'Douwe Maan2018-06-283-38/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Gitaly search and message RPC's mandatory Closes gitaly#1202, gitaly#1201, gitaly#1199, gitaly#1198, and gitaly#951 See merge request gitlab-org/gitlab-ce!20210
| * | | | | Make search and message RPC's mandatoryJacob Vosmaer2018-06-273-38/+4
| |/ / / /
* | | | | Add SHA256 and HEAD on File APIAhmet Demir2018-06-282-11/+56
| | | | |
* | | | | Merge branch 'rs-authorize-is-hard-to-spell' into 'master'Stan Hu2018-06-271-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Correct "autorize" typos See merge request gitlab-org/gitlab-ce!20225
| * | | | Correct "autorize" typosRobert Speicher2018-06-271-1/+1
| | | | |
* | | | | Bring Gitlab::ShardHealthCache to CEToon Claes2018-06-271-0/+41
|/ / / / | | | | | | | | | | | | | | | | It already existed in EE in the Geo namespace. This change brings it to CE.
* | | | Merge branch 'zj-gitaly-read-write-check' into 'master'Nick Thomas2018-06-273-179/+22
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Gitaly metrics check for read/writeability Closes gitaly#1218 See merge request gitlab-org/gitlab-ce!20022
| * | | Gitaly metrics check for read/writeabilityZeger-Jan van de Weg2018-06-273-179/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, health checks checked for writeability of the NFS shards. Given we're moving away from that, this patch extends the checks for Gitaly to check for read and writeability. Potentially some dashboards will break, as over time these metrics will no longer appear as Prometheus doesn't get the data anymore. Observability in the circuit breaker will be reduced, but its not expected to be turned on and the circuit breaker is being removed soon too. Closes https://gitlab.com/gitlab-org/gitaly/issues/1218
* | | | Merge branch 'gitaly-tree-entry-dot-dot' into 'master'Sean McGivern2018-06-272-29/+19
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Client-side fix for Gitaly TreeEntry bug See merge request gitlab-org/gitlab-ce!20176
| * | | Client-side fix for Gitaly TreeEntry buggitaly-tree-entry-dot-dotJacob Vosmaer2018-06-262-29/+19
| | | |
* | | | Merge branch 'ce-update-branch-client-preparation' into 'master'Robert Speicher2018-06-261-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move git calls for `Repository#update_branch` inside Gitlab::Git See merge request gitlab-org/gitlab-ce!20168
| * | | | Move git calls for `Repository#update_branch` inside Gitlab::Gitce-update-branch-client-preparationAlejandro Rodríguez2018-06-251-2/+5
| |/ / / | | | | | | | | | | | | This prepares this code for migration to Gitaly.
* | | | Merge branch 'dm-branch-api-can-push-fix' into 'master'Robert Speicher2018-06-261-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix branch API can_push attribute and add specs See merge request gitlab-org/gitlab-ce!20156
| * | | | Fix branch API can_push attribute and add specsdm-branch-api-can-push-fixDouwe Maan2018-06-251-3/+5
| | |/ / | |/| |
* | | | Merge branch 'add-rename-column-background-helper' into 'master'Yorick Peterse2018-06-264-44/+161
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a helper to rename a column using a background migration Closes #47591 See merge request gitlab-org/gitlab-ce!20180
| * | | | Add a helper to rename a column using a background migrationSean McGivern2018-06-264-44/+161
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | This works the same way as change_column_type_using_background_migration, but for renaming a column. It takes a table, not a relation, to match its concurrent counterpart. Also, generalise the cleanup migrations to reduce code duplication.
* | | | Merge branch 'gitaly-backup-opt-out' into 'master'Douwe Maan2018-06-261-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move repo backup RPC's to opt-out See merge request gitlab-org/gitlab-ce!20151
| * | | | Move repo backup RPC's to opt-outgitaly-backup-opt-outJacob Vosmaer2018-06-251-4/+4
| | | | |
* | | | | Merge branch '48269-wiki-page-returns-error-code-502' into 'master'Douwe Maan2018-06-261-2/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wiki page returns error code 502" Closes #48269 See merge request gitlab-org/gitlab-ce!20174
| * | | | Fix performance bottleneck when rendering large wiki pagesSean McGivern2018-06-261-2/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | `Nokogiri::XML::Node#ancestors` appears to be much slower than `HTML::Pipeline::Filter#has_ancestor?` for these purposes. We already use `#has_ancestor?` elsewhere, so this change also makes this filter more consistent with other banzai filters.
* | | | Rails5 fix arel from in mysql_median_datetime_sqlJasper Maes2018-06-261-1/+7
|/ / /
* | | Merge remote-tracking branch 'dev/master'Alessio Caiazza2018-06-252-2/+3
|\ \ \
| * \ \ Merge branch 'security-2682-fix-xss-for-markdown-toc' into 'master'Alessio Caiazza2018-06-251-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | [master] Fix xss for Markdown elements where [[_TOC_]] is enabled See merge request gitlab/gitlabhq!2400
| | * | | Fix xss for Markdown elements where [[_TOC_]] is enabledMark Chao2018-06-161-1/+1
| | | | |
| * | | | Merge branch 'security-fj-bumping-sanitize-gem' into 'master'Alessio Caiazza2018-06-251-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [master] Update sanitize gem to 4.6.5 to fix HTML injection vulnerability See merge request gitlab/gitlabhq!2399
| | * \ \ \ Merge branch 'master' into 'security-fj-bumping-sanitize-gem'Douwe Maan2018-06-187-156/+39
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile.rails5.lock
| | * | | | | Whitelist text-align property for th and tdDouwe Maan2018-06-181-1/+2
| | | | | | |
* | | | | | | Honor saml assurance level to allow 2FA bypassingRoger Rüttimann2018-06-254-0/+27
| | | | | | |
* | | | | | | Merge branch 'zj-create-from-bundle-mandatory' into 'master'Douwe Maan2018-06-251-10/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves CreateFromBundle RPC to mandatory Closes gitaly#944 See merge request gitlab-org/gitlab-ce!20144
| * | | | | | | Moves another RPC to mandatoryZeger-Jan van de Weg2018-06-251-10/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This specific one isn't used on most machines, therefor low risk. Closes https://gitlab.com/gitlab-org/gitaly/issues/944
* | | | | | | Merge branch 'zj-is-anchestor' into 'master'Douwe Maan2018-06-252-91/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ancestor check is Gitaly only now Closes gitaly#789 and gitaly#308 See merge request gitlab-org/gitlab-ce!20095
| * | | | | | | Update remote happens through Gitaly onlyZeger-Jan van de Weg2018-06-251-75/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes closes another migration! And remotes tests around it, mostly due to stubbing this was needed. Also, these are tested on the Gitaly side too: - https://gitlab.com/gitlab-org/gitaly/issues/791 - https://gitlab.com/gitlab-org/gitaly/blob/6dd74543f6af8ebcf22aa10e39da004f388fdda5/internal/service/repository/fetch_remote_test.go Closes https://gitlab.com/gitlab-org/gitaly/issues/789
| * | | | | | | Anchestor check is Gitaly only nowZeger-Jan van de Weg2018-06-251-16/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/308
* | | | | | | Merge branch 'zj-write-config' into 'master'Douwe Maan2018-06-251-9/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Write Config is mandatory Closes gitaly#879 See merge request gitlab-org/gitlab-ce!20146
| * | | | | | | Write Config is mandatoryZeger-Jan van de Weg2018-06-251-9/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/879
* | | | | | | Merge branch 'zj-missing-part-linguist' into 'master'Douwe Maan2018-06-251-23/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Languages feature gate See merge request gitlab-org/gitlab-ce!20128
| * | | | | | | Remove feature gatezj-missing-part-linguistZeger-Jan van de Weg2018-06-251-23/+2
| |/ / / / / /
* | | | | | | Merge branch 'zj-tree-entry-mandatory' into 'master'Douwe Maan2018-06-251-87/+26
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly tree entry is mandatory Closes gitaly#310 See merge request gitlab-org/gitlab-ce!20099
View Lorry Controller Status