Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'git-env-handle-arrays' into 'master' | Sean McGivern | 2017-10-16 | 3 | -6/+49 |
|\ | |||||
| * | Add Gitlab::Git::Env.to_env_hash | Jacob Vosmaer | 2017-10-16 | 3 | -6/+49 |
* | | Merge branch 'patch-19' into 'master' | Sean McGivern | 2017-10-16 | 1 | -2/+2 |
|\ \ | |||||
| * | | update postgresql requirements | Ben Bodenmiller | 2017-10-14 | 1 | -2/+2 |
* | | | Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' int... | Grzegorz Bizon | 2017-10-16 | 5 | -6/+37 |
|\ \ \ | |||||
| * | | | Don't create build failed todo when build is retried38236-remove-build-failed-todo-if-it-has-been-auto-retried | Sean McGivern | 2017-10-16 | 5 | -6/+37 |
* | | | | Merge branch 'winh-indeterminate-dropdown' into 'master' | Phil Hughes | 2017-10-16 | 2 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | Fix alignment for indeterminate marker in dropdownswinh-indeterminate-dropdown | Winnie Hellmann | 2017-10-11 | 2 | -0/+6 |
* | | | | | Merge branch 'conflict-resolution-refactor' into 'master' | Sean McGivern | 2017-10-16 | 28 | -345/+420 |
|\ \ \ \ \ | |||||
| * | | | | | Move line code generation into Gitlab::Gitconflict-resolution-refactor | Alejandro Rodríguez | 2017-10-12 | 12 | -43/+25 |
| * | | | | | Create a Gitlab::Git submodule for conlict-related files | Alejandro Rodríguez | 2017-10-12 | 24 | -323/+334 |
| * | | | | | Refactor conflict resolution to contain git ops within Gitlab::Git | Alejandro Rodríguez | 2017-10-12 | 18 | -300/+388 |
| * | | | | | Clean hierarchy of calls between models and Gitalb::Git for blob search | Alejandro Rodríguez | 2017-10-12 | 2 | -3/+5 |
| * | | | | | Move Gitlab::Diff::LineCode to module Gitlab::Git | Alejandro Rodríguez | 2017-10-12 | 10 | -20/+20 |
| * | | | | | Encapsulate git operations for conflict resolution into lib | Alejandro Rodríguez | 2017-10-12 | 3 | -60/+52 |
* | | | | | | Merge branch 'fix_diff_parsing' into 'master' | Sean McGivern | 2017-10-16 | 3 | -1/+25 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add a changelog itemfix_diff_parsing | Valery Sizov | 2017-10-15 | 1 | -0/+5 |
| * | | | | | | Fix diff parser so it tolerates to diff special markers in the content | Valery Sizov | 2017-10-15 | 2 | -1/+20 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge branch 'gitaly-call-kwargs' into 'master' | Sean McGivern | 2017-10-16 | 1 | -4/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix confusing double usage of 'metadata' | Jacob Vosmaer (GitLab) | 2017-10-16 | 1 | -4/+16 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'an/popen-deadline' into 'master' | Sean McGivern | 2017-10-16 | 5 | -1/+208 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Popen with a timeout | Andrew Newdigate | 2017-10-16 | 5 | -1/+208 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'implements-closing-docs' into 'master' | Sean McGivern | 2017-10-16 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update automatic_issue_closing.mdimplements-closing-docs | Victor Wu | 2017-10-13 | 1 | -1/+2 |
* | | | | | | | Merge branch 'backport-milestone-select-change' into 'master' | Filipa Lacerda | 2017-10-16 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Backport a change in milestone_select from EEbackport-milestone-select-change | Phil Hughes | 2017-10-13 | 1 | -0/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cl... | Kamil Trzciński | 2017-10-16 | 4 | -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-count | Shinya Maeda | 2017-10-11 | 4 | -0/+31 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch '35853-pages-missing-dotfiles' into 'master' | Kamil Trzciński | 2017-10-16 | 3 | -0/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Include a .hidden directory in pages artifact extraction tests | Nick Thomas | 2017-10-12 | 3 | -0/+5 |
* | | | | | | | | Merge branch '27654-retry-button' into 'master' | Phil Hughes | 2017-10-16 | 5 | -20/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move retry button to sidebar | Filipa Lacerda | 2017-10-16 | 5 | -20/+10 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'bvl-update-settings-api-docs' into 'master' | Achilleas Pipinellis | 2017-10-14 | 1 | -32/+83 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Update the settings api documentationbvl-update-settings-api-docs | Bob Van Landuyt | 2017-10-13 | 1 | -32/+83 |
* | | | | | | | | Merge branch '39111-remove-n-shortcut' into 'master' | Filipa Lacerda | 2017-10-13 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Remove global dropdown shortcut from help modal39111-remove-n-shortcut | Annabel Dunstone Gray | 2017-10-13 | 1 | -4/+0 |
* | | | | | | | | Merge branch 'ph-shortcut-js-modules' into 'master' | Filipa Lacerda | 2017-10-13 | 12 | -322/+242 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | spec fixesph-shortcut-js-modules | Phil Hughes | 2017-10-13 | 2 | -6/+4 |
| * | | | | | | | Remove shortcut JS classes from global namespace | Phil Hughes | 2017-10-13 | 12 | -317/+239 |
* | | | | | | | | Merge branch 'gitlab-ee-1312-time-spent-at' into 'master' | Sean McGivern | 2017-10-13 | 11 | -11/+227 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | added date parameter for time trackinggitlab-ee-1312-time-spent-at | Vlad | 2017-10-13 | 11 | -11/+227 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch '39096-upgrade-vuex' into 'master' | Phil Hughes | 2017-10-13 | 2 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update Vuex version39096-upgrade-vuex | Filipa Lacerda | 2017-10-13 | 2 | -4/+4 |
* | | | | | | | | Merge branch '37571-replace-wikipage-createservice-with-factory' into 'master' | Rémy Coutable | 2017-10-13 | 8 | -27/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Replaces 'WikiPage::CreateService' calls with 'wiki_page' factory | Jacopo | 2017-10-13 | 8 | -27/+12 |
* | | | | | | | | | Merge branch 'gitaly-merge' into 'master' | Sean McGivern | 2017-10-13 | 9 | -17/+143 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Merge Merge Requests via Gitaly | Jacob Vosmaer | 2017-10-13 | 9 | -17/+143 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'grpc-1.6.6' into 'master' | Rémy Coutable | 2017-10-13 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use grpc 1.6.6 | Jacob Vosmaer | 2017-10-13 | 1 | -1/+4 |
* | | | | | | | | | Merge branch 'server-flash-click-remove' into 'master' | Filipa Lacerda | 2017-10-13 | 3 | -2/+34 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | |