Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'remove-trace-efficiently' into 'master' | Kamil Trzciński | 2018-07-06 | 1 | -8/+11 |
|\ | |||||
| * | Revice the changelog | Shinya Maeda | 2018-07-06 | 1 | -1/+0 |
| * | Merge branch 'master' into remove-trace-efficiently | Shinya Maeda | 2018-07-06 | 28 | -134/+210 |
| |\ | |||||
| * | | Invalidate memoization after its erased | Shinya Maeda | 2018-07-04 | 1 | -0/+2 |
| * | | Simplify the comments | Shinya Maeda | 2018-07-04 | 1 | -5/+2 |
| * | | Remove traces efficiently | Shinya Maeda | 2018-07-04 | 1 | -8/+13 |
* | | | Use AlreadyArchivedError if it's the case | Shinya Maeda | 2018-07-06 | 1 | -3/+3 |
* | | | Merge branch 'master' into fix-trace-archive-cron-worker-race-condition | Shinya Maeda | 2018-07-06 | 16 | -61/+157 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'revert-8678cf9b' into 'master' | Grzegorz Bizon | 2018-07-05 | 3 | -8/+94 |
| |\ \ | |||||
| | * | | Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'" | Jacob Vosmaer (GitLab) | 2018-07-05 | 3 | -8/+94 |
| * | | | Updated Gitaly timeout values | Andrew Newdigate | 2018-07-05 | 9 | -49/+50 |
| * | | | Web Terminal Ci Build | Francisco Javier López | 2018-07-05 | 2 | -3/+11 |
| |/ / | |||||
| * | | Merge branch 'issue_48474' into 'master' | Sean McGivern | 2018-07-05 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | Render LegacyDiffNote when diff_file blob is nil | Felipe Artur | 2018-07-04 | 1 | -0/+1 |
| * | | | Merge branch 'remove-unnecessary-ignore-for-gitaly-n-plus-one' into 'master' | Douwe Maan | 2018-07-05 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Clean up Gitaly N+1 stack traces | Sean McGivern | 2018-07-04 | 1 | -1/+1 |
* | | | | | Prevent WRITE opetaions if it's already archived | Shinya Maeda | 2018-07-05 | 1 | -1/+4 |
* | | | | | Fix spec | Shinya Maeda | 2018-07-05 | 1 | -1/+1 |
* | | | | | Check if trace exists before process `archive!` method | Shinya Maeda | 2018-07-05 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch '4266-board-with-config-api-ce' into 'master' | Douwe Maan | 2018-07-04 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Backport from EE !5954 | Mark Chao | 2018-07-04 | 1 | -0/+1 |
* | | | | Merge branch 'ee-5481-epic-todos' into 'master' | Sean McGivern | 2018-07-04 | 1 | -4/+9 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | [backend] Addressed review comments | Jan Provaznik | 2018-07-03 | 1 | -3/+7 |
| * | | | Support todos for epics backport | Jarka Kadlecová | 2018-07-03 | 1 | -3/+4 |
* | | | | Merge branch 'gitaly-mandatory-20180703-jv-2' into 'master' | Sean McGivern | 2018-07-04 | 4 | -43/+10 |
|\ \ \ \ | |||||
| * | | | | Remove more feature flags | Jacob Vosmaer | 2018-07-03 | 4 | -43/+10 |
* | | | | | Merge branch 'remove-is-shared-from-ci-runners' into 'master' | Grzegorz Bizon | 2018-07-04 | 4 | -8/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Make deprecated scopes of Runner explicit | Kamil Trzciński | 2018-07-04 | 1 | -0/+5 |
| * | | | | | Remove the use of `is_shared` of `Ci::Runner`remove-is-shared-from-ci-runners | Kamil Trzciński | 2018-06-26 | 4 | -8/+8 |
* | | | | | | Merge branch 'jprovazn-fix-mr-caching' into 'master' | Sean McGivern | 2018-07-04 | 2 | -6/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use serialize_keys as part of highlight diff cache | Jan Provaznik | 2018-07-04 | 2 | -6/+4 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'jprovazn-direct-upload' into 'master' | Kamil Trzciński (OoO till 3th) | 2018-07-04 | 1 | -7/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Updated multipart to support workhorse direct uploads | Jan Provaznik | 2018-06-27 | 1 | -7/+9 |
* | | | | | | | Merge branch 'bvl-graphql-pipeline-lists' into 'master' | Douwe Maan | 2018-07-04 | 5 | -1/+96 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add pipeline lists to GraphQL | Bob Van Landuyt | 2018-07-04 | 5 | -1/+96 |
* | | | | | | | | Merge branch 'pravi/gitlab-ce-update-html-pipeline' into 'master' | Douwe Maan | 2018-07-04 | 1 | -12/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use strong_memoize to customize the SanitizationFilter whitelist | Robert Speicher | 2018-07-03 | 1 | -12/+5 |
| * | | | | | | | | dup whitelist before modification | Pirate Praveen | 2018-06-30 | 1 | -1/+1 |
* | | | | | | | | | Make more Gitaly features mandatory | Jacob Vosmaer (GitLab) | 2018-07-04 | 3 | -94/+8 |
| |_|_|/ / / / / |/| | | | | | | | |||||
* | | | | | | | | add support for file copy on object storage | Micaël Bergeron | 2018-07-03 | 1 | -19/+3 |
* | | | | | | | | When moving issues, don't attempt to move files in object storage | Stan Hu | 2018-07-03 | 1 | -1/+1 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch '44994-osw-use-monospaced-font-on-diffs-commit-ref' into 'master' | Robert Speicher | 2018-07-03 | 2 | -3/+10 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Use monospaced font for MR diff commit link ref on GFM | Oswaldo Ferreira | 2018-06-27 | 2 | -3/+10 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Make OperationService RPC's mandatory | Jacob Vosmaer (GitLab) | 2018-07-03 | 2 | -286/+47 |
* | | | | | | Merge branch 'fix-gitaly-mr-creation-limits' into 'master' | Douwe Maan | 2018-07-03 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix MR diffs created with gitaly_diff_between enabled | Sean McGivern | 2018-06-29 | 1 | -1/+1 |
* | | | | | | | Merge branch 'jprovazn-extra-line' into 'master' | Sean McGivern | 2018-07-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Don't add bottom 'match' line for deleted files | Jan Provaznik | 2018-06-28 | 1 | -1/+1 |
* | | | | | | | Merge branch '6195-http-git-push-to-secondary-for-git-lfs-currently-does-not-... | Nick Thomas | 2018-07-02 | 1 | -9/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Better route matching for read-only detection | Ash McKenzie | 2018-07-02 | 1 | -9/+24 |