summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge branch 'feature/set-public-email-through-api' into 'master'Rémy Coutable2018-10-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set public email through api Closes #37675 See merge request gitlab-org/gitlab-ce!21938
| * | | | | | | | | | | allow users api to set public_emailAlexis Reigel2018-10-011-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | remove obsolete parameter from users apiAlexis Reigel2018-09-261-1/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sh-fix-issue-52009' into 'master'Sean McGivern2018-10-011-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent Error 500s with invalid relative links Closes #52009 See merge request gitlab-org/gitlab-ce!22001
| * | | | | | | | | | | Prevent Error 500s with invalid relative linksStan Hu2018-09-291-1/+5
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/52009
* | | | | | | | | | | Merge branch '37433-solve-n-1-in-refs-controller-logs-tree' into 'master'Nick Thomas2018-10-013-12/+40
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds list_last_commits_for_tree as the method call for the Gitaly ListLastCommitsForTree RPC Closes #37433 See merge request gitlab-org/gitlab-ce!21921
| * | | | | | | | | | Removes N+1 gitaly rpc call to fetch the last commit for pathTiago Botelho2018-10-013-12/+40
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements list_last_commits_for_tree to communicate with the ListLastCommitsForTree Gitaly RPC Bumps the Gitaly server version Bumps the Gitaly-Proto gem version
* | | | | | | | | | Merge branch '48399-skip-auto-devops-jobs-based-on-license' into 'master'Dmitriy Zaporozhets2018-10-011-3/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip creating auto devops jobs for sast, container_scanning, dast,… See merge request gitlab-org/gitlab-ce!21959
| * | | | | | | | | | Skip creating auto devops jobs for sast, container_scanning, dast, ↵48399-skip-auto-devops-jobs-based-on-licenseDylan Griffith2018-09-271-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependency_scanning when not licensed
* | | | | | | | | | | Merge branch '51651-fill-pipeline-source-for-external-pipelines' into 'master'Kamil Trzciński2018-09-301-0/+50
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fill pipeline source for external pipelines" Closes #51651 See merge request gitlab-org/gitlab-ce!21814
| * | | | | | | | | | Refactor migration specs using ActiveRecord modelsMatija Čupić2018-09-281-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Refactor external_pipelines queryMatija Čupić2018-09-271-8/+5
| | | | | | | | | | |
| * | | | | | | | | | Update all pipelines in single queryMatija Čupić2018-09-271-3/+2
| | | | | | | | | | |
| * | | | | | | | | | Add background migration to fill pipeline sourceMatija Čupić2018-09-251-0/+54
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dz-migration-index-helper' into 'master'Dmitriy Zaporozhets2018-09-281-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add mysql_compatible_index_length to migration helpers Closes #50253 See merge request gitlab-org/gitlab-ce!21852
| * | | | | | | | | Add mysql_compatible_index_length to migration helpersdz-migration-index-helperDmitriy Zaporozhets2018-09-211-0/+4
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'mk/asymmetric-exists-cache' into 'master'Stan Hu2018-09-282-48/+149
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Geo: Does not mark repositories as missing on primary due to stale cache" Closes #50211 and #44044 See merge request gitlab-org/gitlab-ce!21789
| * | | | | | | | | Remove send-in-send for safety and readabilityMichael Kozono2018-09-271-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I attempted to refactor so that the caller of `wrap_method` passes in a block, rather than a method name, but I was unsuccessful. I kept getting the following error: NoMethodError: undefined method `cache_method_output' for Repository:Class If you can figure this out, then feel free to dry up these class methods again without doing a send-within-a-send.
| * | | | | | | | | Expire RequestStore cache properlyMichael Kozono2018-09-271-0/+8
| | | | | | | | | |
| * | | | | | | | | Cache `Repository#exists?` false in RequestStoreMichael Kozono2018-09-272-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Only truthy values are cached in Redis. * All values are cached in RequestStore and in an instance variable.
| * | | | | | | | | Extract `Repository.memoize_method` methodMichael Kozono2018-09-271-47/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And reuse `Gitlab::Utils::StrongMemoize`. There is a subtle behavior change required to reuse StrongMemoize in this case. The early fallback check now occurs *before* reading the memoized value instead of after. I think this is fine since a memoized value should only exist if `exists?` is also already memoized as `true`.
* | | | | | | | | | Extend reports to support security featuresOlivier Gonzalez2018-09-275-76/+98
| | | | | | | | | |
* | | | | | | | | | Merge branch '4907-improve-build-create-performance-for-license-management' ↵Kamil Trzciński2018-09-271-8/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Dont create license_management build when not included in license See merge request gitlab-org/gitlab-ce!21958
| * | | | | | | | | | Dont create license_management build when not included in license4907-improve-build-create-performance-for-license-managementDylan Griffith2018-09-271-8/+7
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves CI performance since we do not create a whole new job that just exits quickly. This is important based on https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/4907#note_104742212
* | | | | | | | | | Typo in log message of gitlab-rake gitlab:artifacts:migrateMichael Bisbjerg2018-09-271-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch '43832-adds-chdmod-to-commits-actions-api' into 'master'Rémy Coutable2018-09-272-2/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to work with execute permissions in GitLab API Closes #43832 See merge request gitlab-org/gitlab-ce!21866
| * | | | | | | | | Adds chmod action to POST /projects/:id/repository/commits APIJacopo2018-09-272-2/+22
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | With this action the user can update the execute_filemode of a given file in the repository.
* | | | | | | | | Merge branch 'feature/add-public-email-to-users-api' into 'master'Rémy Coutable2018-09-271-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature/add public email to users api Closes #39346 See merge request gitlab-org/gitlab-ce!21909
| * | | | | | | | add user's public_email attribute to apiAlexis Reigel2018-09-271-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '50289-vendor-ci-yml-for-the-last-time' into 'master'Kamil Trzciński2018-09-274-19/+82
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update all gitlab CI templates from gitlab-org/gitlab-ci-yml for the last time See merge request gitlab-org/gitlab-ce!21929
| * | | | | | | | Update all gitlab ci templates from gitlab-org/gitlab-ci-yml50289-vendor-ci-yml-for-the-last-timeDylan Griffith2018-09-274-19/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we no longer maintain this separate repo we just needed to do one final copy from there. See https://gitlab.com/gitlab-org/gitlab-ce/issues/50289
* | | | | | | | | Refactor EventFilter and increase its test coverage1801-allow-event_filter-to-be-set-in-the-urlRémy Coutable2018-09-261-60/+26
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'feature/runner-type-filter-for-admin-view' into 'master'Kamil Trzciński2018-09-261-3/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Feature: Runner type filter for admin view See merge request gitlab-org/gitlab-ce!19649
| * | | | | | | add status param to runners apiAlexis Reigel2018-09-151-0/+9
| | | | | | | |
| * | | | | | | add type param to runners apiAlexis Reigel2018-09-151-3/+19
| |/ / / / / /
* | | | | | | Resolve "Un-vendor CI templates"Dylan Griffith2018-09-2647-5/+2327
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'tc-fix-rails5-subquery-selfjoin' into 'master'Douwe Maan2018-09-261-1/+9
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work around a bug in Rails 5, where LIMIT causes trouble Closes #51729 See merge request gitlab-org/gitlab-ce!21879
| * | | | | Work around a bug in Rails 5, where LIMIT causes troubletc-fix-rails5-subquery-selfjoinToon Claes2018-09-251-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original code caused Rails to generate invalid SQL. The problem lays in the `.arel` method in `ActiveRecord::Relation`. When there was a `limit` on the relation, the `LIMIT` statement was taken over to Arel, but the value wasn't. ```ruby relation = Event.limit(2) relation.to_sql #=> "SELECT `events`.* FROM `events` LIMIT 2" relation.arel.to_sql #=> "SELECT `events`.* FROM `events` LIMIT ?" ``` Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51729
* | | | | | Merge branch 'follow-up-geo-sync-disabled-wikis' into 'master'Douglas Barbosa Alexandre2018-09-251-8/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6906 See merge request gitlab-org/gitlab-ce!21903
| * | | | | | Geo: sync disabled wikis. Stage 2follow-up-geo-sync-disabled-wikisValery Sizov2018-09-251-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We started syncing all the wiki regardless of the fact it's disabled or not. We couldn't do that in one stage because of needing of smoth update and deprecating things. This is the second stage that finally removes unused columns in the geo_node_status table.
* | | | | | | Merge branch 'ce-improve-review-apps' into 'master'Douglas Barbosa Alexandre2018-09-252-0/+79
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | [CE] Improve review apps See merge request gitlab-org/gitlab-ce!21087
| * | | | | | [CE] Port review apps file to CEce-improve-review-appsRémy Coutable2018-09-252-0/+79
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'enable-force-write-auth-keys-restore' into 'master'Nick Thomas2018-09-251-2/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Enable the ability to use the force env for rebuilding authorized_keys during a restore See merge request gitlab-org/gitlab-ce!21896
| * | | | | Enable write to auth_keys file during restoreCindy Pallares2018-09-251-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fast lookup of authorized SSH keys in the database was ported to CE in v10.4. This change adds the option to enable the setting via the restore rake task and assumes yes if the force env variable is set.
* | | | | | Merge branch ↵Douglas Barbosa Alexandre2018-09-252-2/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '51747-gitlab-com-unable-to-import-a-project-that-was-just-exported' into 'master' Resolve "gitlab.com: Unable to import a project that was just exported" Closes #43840, #43896, and #51747 See merge request gitlab-org/gitlab-ce!21875
| * | | | | | Fix null pipeline problemJames Lopez2018-09-242-2/+16
| |/ / / / /
* | | | | | Merge branch 'mk/improve-usage-of-request-store' into 'master'Yorick Peterse2018-09-2522-95/+133
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Provide NullStore for RequestStore" Closes #51718 See merge request gitlab-org/gitlab-ce!21848
| * | | | | Refactor Feature.flipper methodmk/improve-usage-of-request-storeMichael Kozono2018-09-241-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix typo in context 'when request store is active' * Rearrange test since the instance variable always gets set now, even if RequestStore is active
| * | | | | Use `Gitlab::SafeRequestStore` in more placesMichael Kozono2018-09-2413-52/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if it doesn’t save lines of code, since people will tend to use code they’ve seen. And `SafeRequestStore` is safer since you don’t have to remember to check `RequestStore.active?`.
| * | | | | Simplify by using Gitlab::SafeRequestStoreMichael Kozono2018-09-247-40/+17
| | | | | | | | | | | | | | | | | | | | | | | | These are clear wins.