summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-175-43/+43
* Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' int...Grzegorz Bizon2017-10-162-5/+29
|\
| * Don't create build failed todo when build is retried38236-remove-build-failed-todo-if-it-has-been-auto-retriedSean McGivern2017-10-162-5/+29
* | Merge branch 'conflict-resolution-refactor' into 'master'Sean McGivern2017-10-168-72/+81
|\ \
| * | Move line code generation into Gitlab::Gitconflict-resolution-refactorAlejandro Rodríguez2017-10-122-11/+11
| * | Create a Gitlab::Git submodule for conlict-related filesAlejandro Rodríguez2017-10-126-38/+38
| * | Refactor conflict resolution to contain git ops within Gitlab::GitAlejandro Rodríguez2017-10-126-61/+70
| * | Move Gitlab::Diff::LineCode to module Gitlab::GitAlejandro Rodríguez2017-10-122-11/+11
| * | Encapsulate git operations for conflict resolution into libAlejandro Rodríguez2017-10-121-1/+1
* | | Merge branch 'fix_diff_parsing' into 'master'Sean McGivern2017-10-161-0/+17
|\ \ \
| * | | Fix diff parser so it tolerates to diff special markers in the contentValery Sizov2017-10-151-0/+17
* | | | Popen with a timeoutAndrew Newdigate2017-10-161-0/+132
* | | | Merge branch 'fix/sm/38960-collect-usage-pings-gcp-cluster-enabled-and-gcp-cl...Kamil Trzciński2017-10-162-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-countShinya Maeda2017-10-112-0/+26
* | | | | 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
* | | | | | Move retry button to sidebarFilipa Lacerda2017-10-161-7/+0
* | | | | | Merge branch 'ph-shortcut-js-modules' into 'master'Filipa Lacerda2017-10-132-9/+6
|\ \ \ \ \ \
| * | | | | | spec fixesph-shortcut-js-modulesPhil Hughes2017-10-131-5/+3
| * | | | | | Remove shortcut JS classes from global namespacePhil Hughes2017-10-132-4/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'gitlab-ee-1312-time-spent-at' into 'master'Sean McGivern2017-10-133-2/+136
|\ \ \ \ \ \
| * | | | | | added date parameter for time trackinggitlab-ee-1312-time-spent-atVlad2017-10-133-2/+136
| |/ / / / /
* | | | | | Merge branch '37571-replace-wikipage-createservice-with-factory' into 'master'Rémy Coutable2017-10-137-27/+7
|\ \ \ \ \ \
| * | | | | | Replaces 'WikiPage::CreateService' calls with 'wiki_page' factoryJacopo2017-10-137-27/+7
* | | | | | | Merge branch 'gitaly-merge' into 'master'Sean McGivern2017-10-132-10/+59
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge Merge Requests via GitalyJacob Vosmaer2017-10-132-10/+59
* | | | | | | Merge branch 'server-flash-click-remove' into 'master'Filipa Lacerda2017-10-131-0/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixed server rendered flash not being removed on clickserver-flash-click-removePhil Hughes2017-10-131-0/+21
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'backport-ee-2869' into 'master'Sean McGivern2017-10-132-15/+33
|\ \ \ \ \ \
| * | | | | | backport for gitlab-ee!2869backport-ee-2869Simon Knox2017-10-132-15/+33
| |/ / / / /
* | | | | | Merge branch '39032-improve-merge-ongoing-check-consistency' into 'master'Sean McGivern2017-10-132-1/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Simplify check for running job on Redis39032-improve-merge-ongoing-check-consistencyOswaldo Ferreira2017-10-132-2/+14
| * | | | | Make "merge ongoing" check more consistentOswaldo Ferreira2017-10-111-1/+21
* | | | | | Add create merge checkbox.Jacob Schatz2017-10-122-57/+117
* | | | | | Merge branch '26763-grant-registry-auth-scope-to-admins' into 'master'Kamil Trzciński2017-10-121-1/+49
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | fix code style issuesVratislav Kalenda2017-10-101-2/+10
| * | | | | fix lintVratislav Kalenda2017-10-081-6/+3
| * | | | | remove whitespaceVratislav Kalenda2017-10-081-3/+1
| * | | | | Issue JWT token with registry:catalog:* scope when requested by GitLab adminVratislav Kalenda2017-10-081-0/+45
* | | | | | Merge branch 'fix/rugged-alternate-paths' into 'master'Douwe Maan2017-10-121-2/+2
|\ \ \ \ \ \
| * | | | | | Fix the format of rugged alternate directory listfix/rugged-alternate-pathsAhmad Sherif2017-10-121-2/+2
* | | | | | | Merge branch '34897-delete-branch-after-merge' into 'master'Sean McGivern2017-10-122-7/+22
|\ \ \ \ \ \ \
| * | | | | | | add specmicael.bergeron2017-10-112-7/+22
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'gitaly-fetch-remote' into 'master'Dmitriy Zaporozhets2017-10-121-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Add `Gitlab::Git::Repository#fetch` commandgitaly-fetch-remoteAlejandro Rodríguez2017-10-091-0/+15
* | | | | | | | Merge branch '37691-subscription-fires-multiple-notifications' into 'master'Sean McGivern2017-10-122-7/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | fix a wrong method call in the refactormicael.bergeron2017-10-121-1/+1
| * | | | | | | | fix multiple notifications from being sent for multiple labelsmicael.bergeron2017-10-102-7/+19
* | | | | | | | | Merge branch 'cache-issuable-template-names' into 'master'Douwe Maan2017-10-122-1/+15
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Cache issuable template namesSean McGivern2017-10-122-1/+11
View Lorry Controller Status