summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* dump gitaly logs to stdoutgitaly-always-bundle-configJacob Vosmaer2017-10-212-2/+2
* Try an absolute pathJacob Vosmaer2017-10-211-1/+1
* Set BUNDLE_PATH when building gitaly in CIJacob Vosmaer2017-10-171-2/+2
* Revert "Mess with bundler, what could go wrong"Jacob Vosmaer2017-10-171-2/+1
* Mess with bundler, what could go wrongJacob Vosmaer2017-10-171-1/+2
* Try out always-bundle-config branch in gitalyJacob Vosmaer2017-10-171-1/+1
* Merge branch 'git-env-handle-arrays' into 'master'Sean McGivern2017-10-163-6/+49
|\
| * Add Gitlab::Git::Env.to_env_hashJacob Vosmaer2017-10-163-6/+49
* | Merge branch 'patch-19' into 'master'Sean McGivern2017-10-161-2/+2
|\ \
| * | update postgresql requirementsBen Bodenmiller2017-10-141-2/+2
* | | Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' int...Grzegorz Bizon2017-10-165-6/+37
|\ \ \
| * | | Don't create build failed todo when build is retried38236-remove-build-failed-todo-if-it-has-been-auto-retriedSean McGivern2017-10-165-6/+37
* | | | Merge branch 'winh-indeterminate-dropdown' into 'master'Phil Hughes2017-10-162-0/+6
|\ \ \ \
| * | | | Fix alignment for indeterminate marker in dropdownswinh-indeterminate-dropdownWinnie Hellmann2017-10-112-0/+6
* | | | | Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-1628-345/+420
|\ \ \ \ \
| * | | | | Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-1212-43/+25
| * | | | | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-1224-323/+334
| * | | | | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-1218-300/+388
| * | | | | Clean hierarchy of calls between models and Gitalb::Git for blob searchAlejandro Rodríguez2017-10-122-3/+5
| * | | | | Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-1210-20/+20
| * | | | | Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-123-60/+52
* | | | | | Merge branch 'fix_diff_parsing' into 'master'Sean McGivern2017-10-163-1/+25
|\ \ \ \ \ \
| * | | | | | add a changelog itemfix_diff_parsingValery Sizov2017-10-151-0/+5
| * | | | | | Fix diff parser so it tolerates to diff special markers in the contentValery Sizov2017-10-152-1/+20
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'gitaly-call-kwargs' into 'master'Sean McGivern2017-10-161-4/+16
|\ \ \ \ \ \
| * | | | | | Fix confusing double usage of 'metadata'Jacob Vosmaer (GitLab)2017-10-161-4/+16
|/ / / / / /
* | | | | | Merge branch 'an/popen-deadline' into 'master'Sean McGivern2017-10-165-1/+208
|\ \ \ \ \ \
| * | | | | | Popen with a timeoutAndrew Newdigate2017-10-165-1/+208
|/ / / / / /
* | | | | | Merge branch 'implements-closing-docs' into 'master'Sean McGivern2017-10-161-1/+2
|\ \ \ \ \ \
| * | | | | | Update automatic_issue_closing.mdimplements-closing-docsVictor Wu2017-10-131-1/+2
* | | | | | | Merge branch 'backport-milestone-select-change' into 'master'Filipa Lacerda2017-10-161-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Backport a change in milestone_select from EEbackport-milestone-select-changePhil Hughes2017-10-131-0/+2
| |/ / / / / /
* | | | | | | Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cl...Kamil Trzciński2017-10-164-0/+31
|\ \ \ \ \ \ \
| * | | | | | | Collect usage pings `Gcp::Cluster.enabled` and `Gcp::Cluster.disabled`, inste...fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cluster-disabled-instead-of-gcp-cluster-countShinya Maeda2017-10-114-0/+31
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '35853-pages-missing-dotfiles' into 'master'Kamil Trzciński2017-10-163-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Include a .hidden directory in pages artifact extraction testsNick Thomas2017-10-123-0/+5
* | | | | | | | Merge branch '27654-retry-button' into 'master'Phil Hughes2017-10-165-20/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Move retry button to sidebarFilipa Lacerda2017-10-165-20/+10
|/ / / / / / / /
* | | | | | | | Merge branch 'bvl-update-settings-api-docs' into 'master'Achilleas Pipinellis2017-10-141-32/+83
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Update the settings api documentationbvl-update-settings-api-docsBob Van Landuyt2017-10-131-32/+83
* | | | | | | | Merge branch '39111-remove-n-shortcut' into 'master'Filipa Lacerda2017-10-131-4/+0
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Remove global dropdown shortcut from help modal39111-remove-n-shortcutAnnabel Dunstone Gray2017-10-131-4/+0
* | | | | | | | Merge branch 'ph-shortcut-js-modules' into 'master'Filipa Lacerda2017-10-1312-322/+242
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | spec fixesph-shortcut-js-modulesPhil Hughes2017-10-132-6/+4
| * | | | | | | Remove shortcut JS classes from global namespacePhil Hughes2017-10-1312-317/+239
* | | | | | | | Merge branch 'gitlab-ee-1312-time-spent-at' into 'master'Sean McGivern2017-10-1311-11/+227
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | added date parameter for time trackinggitlab-ee-1312-time-spent-atVlad2017-10-1311-11/+227
| |/ / / / / /
* | | | | | | Merge branch '39096-upgrade-vuex' into 'master'Phil Hughes2017-10-132-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Update Vuex version39096-upgrade-vuexFilipa Lacerda2017-10-132-4/+4
* | | | | | | | Merge branch '37571-replace-wikipage-createservice-with-factory' into 'master'Rémy Coutable2017-10-138-27/+12
|\ \ \ \ \ \ \ \
View Lorry Controller Status