summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '44191-reduce-redis-usage-from-merge-request-diffs-caching' into...Stan Hu2018-03-151-5/+9
|\
| * Only cache MR diffs for one week44191-reduce-redis-usage-from-merge-request-diffs-cachingSean McGivern2018-03-151-1/+1
| * Only cache highlight results for latest MR diffsSean McGivern2018-03-151-4/+8
* | Merge branch 'adamco/gitlab-ce-move-issue-command' into 'master'Grzegorz Bizon2018-03-153-0/+99
|\ \
| * | Add slash command for moving an issueSean McGivern2018-03-153-0/+99
* | | Merge branch 'fix-42459-#-in-branch' into 'master'Sean McGivern2018-03-151-1/+1
|\ \ \
| * | | Manually escape '#' when building relative uris, fixes #42459Jan2018-03-111-1/+1
* | | | Merge branch 'backstage/gb/refactor-ci-cd-variables-collections' into 'master'42762-project-settings-sections-cannot-be-expanded-after-submission-errorKamil Trzciński2018-03-152-0/+88
|\ \ \ \
| * | | | Improve predefined variables collection methodsGrzegorz Bizon2018-03-141-2/+2
| * | | | Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collectionsGrzegorz Bizon2018-03-1470-384/+931
| |\ \ \ \
| * | | | | Add more unit tests for variables collection classGrzegorz Bizon2018-03-131-1/+0
| * | | | | Improve how we handle persistent runner variablesGrzegorz Bizon2018-03-131-10/+2
| * | | | | Make predefined variables in a collection public by defaultGrzegorz Bizon2018-03-131-1/+1
| * | | | | DRY project-level predefined variablesGrzegorz Bizon2018-03-131-0/+6
| * | | | | Add TODOs to refactoried variables collections codeGrzegorz Bizon2018-03-122-0/+5
| * | | | | Use variables collection as build predefined variablesGrzegorz Bizon2018-03-122-2/+8
| * | | | | Extract variables collection item to a separate classGrzegorz Bizon2018-03-122-31/+48
| * | | | | Document runner's expecations regarding variable collectionGrzegorz Bizon2018-03-121-6/+11
| * | | | | Make variables collection to runner mapping explicitGrzegorz Bizon2018-03-071-3/+1
| * | | | | Merge branch 'master' into backstage/gb/refactor-ci-cd-variables-collectionsGrzegorz Bizon2018-03-07702-6609/+22806
| |\ \ \ \ \
| * | | | | | Introduce CI/CD variables collection classGrzegorz Bizon2017-09-221-0/+60
* | | | | | | Merge branch 'ab-44205-user_interacted_projects-migration' into 'master'Yorick Peterse2018-03-151-0/+13
|\ \ \ \ \ \ \
| * | | | | | | Fix concurrency issue with migration for user_interacted_projects table.ab-44205-user_interacted_projects-migrationAndreas Brandl2018-03-141-0/+13
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'Robert Speicher2018-03-141-5/+11
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix moving local files during namespace transferMichael Kozono2018-03-131-5/+11
| |/ / / / /
* | | | | | Merge branch 'bvl-import-zip-multiple-assignees' into 'master'Sean McGivern2018-03-141-0/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Import multiple issue assignees from GitLab exportBob Van Landuyt2018-03-141-0/+9
| |/ / / /
* | | | | Set Gitlab::Shell#create_repository as OPT_OUTZeger-Jan van de Weg2018-03-141-4/+5
* | | | | Change Gitlab::Shell#add_namespace to #create_namespaceZeger-Jan van de Weg2018-03-142-3/+3
|/ / / /
* | | | Merge branch '44161-use-configured-git' into 'master'Douwe Maan2018-03-131-6/+6
|\ \ \ \
| * | | | Respect the configured git path for imported gitlab-shell operations44161-use-configured-gitNick Thomas2018-03-121-6/+6
* | | | | Capture Gitaly calls that don't go through `migrate`Sean McGivern2018-03-132-13/+23
* | | | | Add Gitaly call details to the performance barSean McGivern2018-03-132-1/+36
* | | | | Merge branch 'rd-fix-github-url-when-listing-repositories-at-importing' into ...Douwe Maan2018-03-125-8/+5
|\ \ \ \ \
| * | | | | Fix provider server URL used when listing repos to importrd-fix-github-url-when-listing-repositories-at-importingRubén Dávila2018-03-125-8/+5
| | |_|_|/ | |/| | |
* | | | | Fix timestamp to include %M instead of %I for post-deploy migrations.ab-44121-post-deploy-migrations-time-formatAndreas Brandl2018-03-121-1/+1
* | | | | Merge branch 'allow-ee-in-backtraces' into 'master'Robert Speicher2018-03-121-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Include the ee/ directory in backtracesallow-ee-in-backtracesSean McGivern2018-03-121-0/+1
* | | | | Respect the protocol in `expose_url`Toon Claes2018-03-121-1/+1
* | | | | Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-121-1/+5
|\ \ \ \ \
| * | | | | Avoid re-fetching merge-base SHA from Gitaly unnecessarilyOswaldo Ferreira2018-03-071-1/+5
* | | | | | Fix code and wiki search results when filename is non-ASCIISean McGivern2018-03-121-2/+2
| |_|/ / / |/| | | |
* | | | | Merge branch 'osw-43951-single-batch-blob-request-to-gitaly' into 'master'Sean McGivern2018-03-091-8/+10
|\ \ \ \ \
| * | | | | Submit a single batch blob RPC to Gitaly per HTTP request when viewing diffsOswaldo Ferreira2018-03-091-8/+10
* | | | | | Add rake task to cleanup any existing exclusive leaseGabriel Mazetto2018-03-092-0/+19
| |_|/ / / |/| | | |
* | | | | Merge branch 'jprovazn-commits-count-reschedule' into 'master'Yorick Peterse2018-03-091-1/+1
|\ \ \ \ \
| * | | | | Reschedule commits_count background migrationjprovazn-commits-count-rescheduleJan Provaznik2018-03-091-1/+1
* | | | | | Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-094-32/+147
|\ \ \ \ \ \
| * | | | | | Cache `#can_be_resolved_in_ui?` git operationscache-refactorAlejandro Rodríguez2018-03-082-3/+32
| * | | | | | Refactor RepositoryCache to make it usable in other classesAlejandro Rodríguez2018-03-063-30/+116