| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'sha-handling' into 'master' | Douwe Maan | 2017-10-16 | 1 | -5/+6 |
| |\ | |||||
| | * | Adds requirements that supports anything in sha params | Guilherme Vieira | 2017-10-12 | 1 | -5/+6 |
| * | | Merge branch 'zj-add-performance-changelog-cat' into 'master' | Robert Speicher | 2017-10-16 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Add Performance category to the changelog | Zeger-Jan van de Weg | 2017-10-13 | 1 | -1/+1 |
| * | | | Merge branch 'git-env-handle-arrays' into 'master' | Sean McGivern | 2017-10-16 | 1 | -5/+37 |
| |\ \ \ | |||||
| | * | | | Add Gitlab::Git::Env.to_env_hash | Jacob Vosmaer | 2017-10-16 | 1 | -5/+37 |
| * | | | | Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' int... | Grzegorz Bizon | 2017-10-16 | 2 | -5/+29 |
| |\ \ \ \ | |||||
| | * | | | | 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 | 2 | -5/+29 |
| * | | | | | Merge branch 'conflict-resolution-refactor' into 'master' | Sean McGivern | 2017-10-16 | 8 | -72/+81 |
| |\ \ \ \ \ | |||||
| | * | | | | | Move line code generation into Gitlab::Gitconflict-resolution-refactor | Alejandro Rodríguez | 2017-10-12 | 2 | -11/+11 |
| | * | | | | | Create a Gitlab::Git submodule for conlict-related files | Alejandro Rodríguez | 2017-10-12 | 6 | -38/+38 |
| | * | | | | | Refactor conflict resolution to contain git ops within Gitlab::Git | Alejandro Rodríguez | 2017-10-12 | 6 | -61/+70 |
| | * | | | | | Move Gitlab::Diff::LineCode to module Gitlab::Git | Alejandro Rodríguez | 2017-10-12 | 2 | -11/+11 |
| | * | | | | | Encapsulate git operations for conflict resolution into lib | Alejandro Rodríguez | 2017-10-12 | 1 | -1/+1 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge branch 'fix_diff_parsing' into 'master' | Sean McGivern | 2017-10-16 | 1 | -0/+17 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix diff parser so it tolerates to diff special markers in the content | Valery Sizov | 2017-10-15 | 1 | -0/+17 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Popen with a timeout | Andrew Newdigate | 2017-10-16 | 1 | -0/+132 |
| * | | | | | Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cl... | Kamil Trzciński | 2017-10-16 | 2 | -0/+26 |
| |\ \ \ \ \ | |||||
| | * | | | | | 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 | 2 | -0/+26 |
| * | | | | | | 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 |
| * | | | | | | | Move retry button to sidebar | Filipa Lacerda | 2017-10-16 | 1 | -7/+0 |
| * | | | | | | | Merge branch 'ph-shortcut-js-modules' into 'master' | Filipa Lacerda | 2017-10-13 | 2 | -9/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | spec fixesph-shortcut-js-modules | Phil Hughes | 2017-10-13 | 1 | -5/+3 |
| | * | | | | | | | Remove shortcut JS classes from global namespace | Phil Hughes | 2017-10-13 | 2 | -4/+3 |
| | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'gitlab-ee-1312-time-spent-at' into 'master' | Sean McGivern | 2017-10-13 | 3 | -2/+136 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | added date parameter for time trackinggitlab-ee-1312-time-spent-at | Vlad | 2017-10-13 | 3 | -2/+136 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch '37571-replace-wikipage-createservice-with-factory' into 'master' | Rémy Coutable | 2017-10-13 | 7 | -27/+7 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Replaces 'WikiPage::CreateService' calls with 'wiki_page' factory | Jacopo | 2017-10-13 | 7 | -27/+7 |
| * | | | | | | | | Merge branch 'gitaly-merge' into 'master' | Sean McGivern | 2017-10-13 | 2 | -10/+59 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| | * | | | | | | | Merge Merge Requests via Gitaly | Jacob Vosmaer | 2017-10-13 | 2 | -10/+59 |
| * | | | | | | | | Merge branch 'server-flash-click-remove' into 'master' | Filipa Lacerda | 2017-10-13 | 1 | -0/+21 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| | * | | | | | | | Fixed server rendered flash not being removed on clickserver-flash-click-remove | Phil Hughes | 2017-10-13 | 1 | -0/+21 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'backport-ee-2869' into 'master' | Sean McGivern | 2017-10-13 | 2 | -15/+33 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | backport for gitlab-ee!2869backport-ee-2869 | Simon Knox | 2017-10-13 | 2 | -15/+33 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master' | Sean McGivern | 2017-10-13 | 2 | -1/+33 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| | * | | | | | | Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistency | Oswaldo Ferreira | 2017-10-13 | 2 | -2/+14 |
| | * | | | | | | Make "merge ongoing" check more consistent | Oswaldo Ferreira | 2017-10-11 | 1 | -1/+21 |
| * | | | | | | | Add create merge checkbox. | Jacob Schatz | 2017-10-12 | 2 | -57/+117 |
| * | | | | | | | Merge branch '26763-grant-registry-auth-scope-to-admins' into 'master' | Kamil Trzciński | 2017-10-12 | 1 | -1/+49 |
| |\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| | * | | | | | | fix code style issues | Vratislav Kalenda | 2017-10-10 | 1 | -2/+10 |
| | * | | | | | | fix lint | Vratislav Kalenda | 2017-10-08 | 1 | -6/+3 |
| | * | | | | | | remove whitespace | Vratislav Kalenda | 2017-10-08 | 1 | -3/+1 |
| | * | | | | | | Issue JWT token with registry:catalog:* scope when requested by GitLab admin | Vratislav Kalenda | 2017-10-08 | 1 | -0/+45 |
| * | | | | | | | Merge branch 'fix/rugged-alternate-paths' into 'master' | Douwe Maan | 2017-10-12 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix the format of rugged alternate directory listfix/rugged-alternate-paths | Ahmad Sherif | 2017-10-12 | 1 | -2/+2 |
| * | | | | | | | | Merge branch '34897-delete-branch-after-merge' into 'master' | Sean McGivern | 2017-10-12 | 2 | -7/+22 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | add spec | micael.bergeron | 2017-10-11 | 2 | -7/+22 |
| | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | | Merge branch 'gitaly-fetch-remote' into 'master' | Dmitriy Zaporozhets | 2017-10-12 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add `Gitlab::Git::Repository#fetch` commandgitaly-fetch-remote | Alejandro Rodríguez | 2017-10-09 | 1 | -0/+15 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |