summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Extract git push from merge request refresh serviceGrzegorz Bizon2018-09-281-3/+14
| | | | | | | | | | |
| * | | | | | | | | | Add a class that represents a git push operationGrzegorz Bizon2018-09-281-0/+25
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '52143-use-tiller-directly' into 'master'Dmitriy Zaporozhets2018-10-051-5/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use tiller directly for Auto DevOps Closes #52143 See merge request gitlab-org/gitlab-ce!22076
| * | | | | | | | | | Redirect IO streams to prevent hangingThong Kuah2018-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://en.wikipedia.org/wiki/Nohup#Overcoming_hanging https://gitlab.com/gitlab-org/gitlab-runner/issues/2880
| * | | | | | | | | | Use tiller directly for Auto DevOpsThong Kuah2018-10-051-5/+2
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves a external network call to fetch a helm plugin. The cost is a few lines of shell script
* | | | | | | | | | Merge branch 'revert-2f0a0761' into 'master'Douwe Maan2018-10-051-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'feature/git-v2-flag' into 'master'" See merge request gitlab-org/gitlab-ce!22134
| * | | | | | | | | | Revert "Merge branch 'feature/git-v2-flag' into 'master'"James Lopez2018-10-051-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | This reverts merge request !21520
* | | | | | | | | | Merge branch 'features/unauth-access-ssh-keys' into 'master'Douwe Maan2018-10-051-4/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | List public ssh keys by id or username without authentication See merge request gitlab-org/gitlab-ce!20118
| * | | | | | | | | List public ssh keys by id or username without authenticationRonald Claveau2018-10-031-4/+2
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mao/48221-issues_show_sql_count' into 'master'Sean McGivern2018-10-052-1/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Banzai label ref finder - minimize SQL calls by sharing context more aggresively Closes #48221 See merge request gitlab-org/gitlab-ce!22070
| * | | | | | | | Banzai project ref- share context more aggresivelyMario de la Ossa2018-10-042-1/+2
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes `Banzai::CrossProjectReference#parent_from_ref` to return the project in the context if the project's `full_path` matches the ref we're looking for, as it makes no sense to go to the database to find a Project we already have loaded.
* | | | | | | | Merge branch 'ce-7287-epic-references' into 'master'Nick Thomas2018-10-041-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support short reference to epics from project entities See merge request gitlab-org/gitlab-ce!22048
| * | | | | | | | Support short reference to group entities from project entitiesce-7287-epic-referencesJarka Košanová2018-10-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add a direct project parent (group) to Banzai context - if an epic is referenced from a direct descendant -> change epic to_reference to use short reference
* | | | | | | | | Merge branch 'fix-todo-cops' into 'master'Rémy Coutable2018-10-044-6/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix todo cops See merge request gitlab-org/gitlab-ce!21850
| * | | | | | | | Fix UriDefaultParser copSemyon Pupkov2018-09-211-1/+1
| | | | | | | | |
| * | | | | | | | Fix UnneededRequireStatement copSemyon Pupkov2018-09-211-2/+0
| | | | | | | | |
| * | | | | | | | Fix SpaceInsidePercentLiteralDelimiters copSemyon Pupkov2018-09-201-2/+2
| | | | | | | | |
| * | | | | | | | Fix SpaceBeforeFirstArg copSemyon Pupkov2018-09-201-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '51958-fix-mr-discussion-loading' into 'master'Phil Hughes2018-10-041-0/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR discussion not loaded issue Closes #51958 See merge request gitlab-org/gitlab-ce!21982
| * | | | | | | | | Fix MR discussion not loaded issue51958-fix-mr-discussion-loadingMark Chao2018-10-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display `formatter` as the sole content of `position` object. This means `diff_file` data is not referenced, which is the caseu of "IOError: not opened for reading".
* | | | | | | | | | Includes commit stats in POST project commits API51803-include-commits-stats-in-projects-apiJacopo2018-10-031-1/+2
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge branch '45016-add-web-ide-commits-to-usage-ping' into 'master'Douwe Maan2018-10-033-0/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Web IDE commits to usage ping Closes #45016 See merge request gitlab-org/gitlab-ce!22007
| * | | | | | | | | Implements Web IDE commits counter in RedisTiago Botelho2018-10-033-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes a temporary implementation of the Web IDE commits counter using Redis while https://gitlab.com/gitlab-org/gitlab-ce/issues/52096 is being discussed further for a more generic approach to counters
| * | | | | | | | | Adds WebIDE commits to UsagePingTiago Botelho2018-10-012-0/+8
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements UsageCounters model to track feature usage counters and makes easy to extend for future counters
* | | | | | | | | Merge branch '48004-db-initialize-migrate' into 'master'Dmitriy Zaporozhets2018-10-031-20/+53
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support db migration and initialization for Auto DevOps Closes #48004 See merge request gitlab-org/gitlab-ce!21955
| * | | | | | | | | Process $DB_INITIALIZE and $DB_MIGRATE variablesThong Kuah2018-09-271-20/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if $DB_INITIALIZE is present, deploy an initial release where only $DB_INITIALIZE is run in a special job (and deployments are not rendered/loaded). This is then followed by second release with deployments as usual. if $DB_MIGRATE, set this value which will trigger a pre-upgrade helm hook.
* | | | | | | | | | Merge branch 'remove-rugged' into 'master'Douwe Maan2018-10-038-114/+27
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Gitlab::Git::Repository#rugged See merge request gitlab-org/gitlab-ce!22039
| * | | | | | | | | | Remove Gitlab::Git::Repository#rugged and Gollum codeAlejandro Rodríguez2018-10-028-114/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup code, and refactor tests that still use Rugged. After this, there should be no Rugged code that access the instance's repositories on non-test environments. There is still some rugged code for other tasks like the repository import task, but since it doesn't access any repository storage path it can stay.
* | | | | | | | | | | #13650 added wip search functionality and testsChantal Rollison2018-10-031-1/+1
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch '49952-port-upgrade-command-to-ce' into 'master'Kamil Trzciński2018-10-022-0/+89
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port UpgradeCommand to CE See merge request gitlab-org/gitlab-ce!21949
| * | | | | | | | | | Port Helm::Api EE extensions to CE49952-port-upgrade-command-to-ceThong Kuah2018-10-011-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We will need these utility level code in the future to help upgrade all helm applications.
| * | | | | | | | | | Port UpgradeCommand to CEThong Kuah2018-09-271-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a utility class that we will need in the future to update and upgrade our managed helm applications, which we do plan to do in CE.
* | | | | | | | | | | CE Resolve "Refactor code quality similar to JUnit tests"Matija Čupić2018-10-021-1/+2
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'bvl-show-pre-release-sha' into 'master'Sean McGivern2018-10-021-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show the commit-sha for pre-release versions Closes #52050 See merge request gitlab-org/gitlab-ce!22026
| * | | | | | | | | Show the commit-sha for pre-release versionsBob Van Landuyt2018-10-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pre-release tags are set at the beginning of a release, so it would be impossible to figure out which version was running if we're running nightlies. In that case it's better to still link to the SHA. These versions don't get deployed to .com.
* | | | | | | | | | Merge branch 'osw-configurable-single-diff-file-limit' into 'master'Douwe Maan2018-10-022-32/+32
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make single diff patch limit configurable Closes #48027 See merge request gitlab-org/gitlab-ce!21886
| * | | | | | | | | | Make single diff patch limit configurableosw-configurable-single-diff-file-limitOswaldo Ferreira2018-10-012-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Creates a new column to hold the single patch limit value on application_settings - Allows updating this value through the application_settings API - Calculates single diff patch collapsing limit based on diff_max_patch_bytes column - Updates diff limit documentation - Adds documentation (with warning) as of how one can update this limit
* | | | | | | | | | | Use tiller locally for Auto DevopsThong Kuah2018-10-021-9/+18
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Add variables on pipeline webhookPierre Tardy2018-10-011-1/+2
| | | | | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'dev/master'Bob Van Landuyt2018-10-013-5/+33
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'security-2697-code-highlight-timeout' into 'master'Bob Van Landuyt2018-10-011-1/+13
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Fix syntax highlight taking too long Closes #2697 See merge request gitlab/gitlabhq!2467
| | * | | | | | | | | | Fix syntax highlight taking too longMark Chao2018-09-031-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Timeout to switch to plain rendering
| * | | | | | | | | | | [master] Stored XSS in Gitlab Merge Request from imported repositoryFrancisco Javier López2018-10-011-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'fix-events-finder-incomplete' into 'master'Bob Van Landuyt2018-10-011-3/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Redact events shown in the events API See merge request gitlab/gitlabhq!2514
| | * | | | | | | | | | Redact events shown in the events APINick Thomas2018-09-211-3/+19
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
* | | | | | | | | | | Merge branch 'lib-api-frozen-string-enable' into 'master'Rémy Coutable2018-10-01100-1/+202
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable frozen string in lib/api and lib/backup See merge request gitlab-org/gitlab-ce!22005
| * | | | | | | | | | | Enable frozen string in lib/api and lib/backupgfyoung2018-09-29100-1/+202
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially addresses #47424. Had to make changes to spec files because stubbing methods on frozen objects is a mess in RSpec and leads to failures: https://github.com/rspec/rspec-mocks/issues/1190
* | | | | | | | | | | Merge branch '51021-more-attr-encrypted' into 'master'Rémy Coutable2018-10-013-0/+114
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encrypt webhook tokens and URLs in the database Closes #51021 See merge request gitlab-org/gitlab-ce!21645
| * | | | | | | | | | | Migrate sensitive web hook data in the backgroundNick Thomas2018-10-012-0/+108
| | | | | | | | | | | |
| * | | | | | | | | | | Encrypt webhook tokens and URLs in the databaseNick Thomas2018-10-011-0/+6
| | | | | | | | | | | |
View Lorry Controller Status