summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '44257-viewing-a-particular-commit-gives-500-error-error-undefin...Douwe Maan2018-03-191-18/+21
|\
| * Ensure that we never assume old_blob or new_blob are nil44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binarySean McGivern2018-03-161-18/+21
* | Merge branch 'master' into 'update-kubeclient'Grzegorz Bizon2018-03-1724-36/+335
|\ \
| * | Fix "A copy of Gitlab::Metrics::Methods" have been removed errorStan Hu2018-03-161-1/+1
| * | Merge branch '41902-add-api-option-to-overwrite-project-description-on-projec...Grzegorz Bizon2018-03-163-4/+20
| |\ \
| | * | Adds the option to override project description on export via APITiago Botelho2018-03-163-4/+20
| * | | Merge branch '44126-setup-middleware-before-adapter' into 'master'Kamil Trzciński2018-03-161-2/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Setup Faraday middleware before adapterLin Jen-Shin2018-03-161-2/+3
| | |/
| * | Merge branch 'jej/commit-api-tracks-lfs' into 'master'Dmitriy Zaporozhets2018-03-162-3/+11
| |\ \
| | * | Extract constant for LfsPointerFile::VERSION_LINEJames Edwards-Jones2018-03-161-1/+4
| | * | Avoid printing data for LfsPointerFile#inspectjej/commit-api-tracks-lfsJames Edwards-Jones2018-03-151-0/+4
| | * | Lfs::FileTranformer caches .gitattributes parserJames Edwards-Jones2018-03-151-2/+3
| * | | Merge branch 'sh-cache-table-exists' into 'master'Yorick Peterse2018-03-162-1/+6
| |\ \ \
| | * | | Cache table_exists?('application_settings') to reduce repeated schema reloadssh-cache-table-existsStan Hu2018-03-152-1/+6
| * | | | Merge branch 'sh-cache-column-exists' into 'master'Yorick Peterse2018-03-161-0/+4
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Cache column_exists? for application settingssh-cache-column-existsStan Hu2018-03-151-0/+4
| * | | 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
* | | | | | | Replace KubeException with Kubeclient::HttpError (kubeclient 3.0)Pirate Praveen2018-03-151-1/+1
|/ / / / / /