summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update new project docsupdate-new-project-docsAnnabel Dunstone Gray2017-10-162-1/+1
* Merge branch 'fix_global_board_routes_39073' into 'master'Douwe Maan2017-10-164-16/+20
|\
| * Fix feature specs for new scoped urls for boardsfix_global_board_routes_39073Valery Sizov2017-10-131-2/+2
| * Add a changelog itemValery Sizov2017-10-131-0/+5
| * Remove boards from the list of reserved top pathsValery Sizov2017-10-131-1/+0
| * Move global boards routes under "-" scopeValery Sizov2017-10-131-13/+13
* | Merge branch 'sha-handling' into 'master'Douwe Maan2017-10-169-28/+33
|\ \
| * | Adds requirements that supports anything in sha paramsGuilherme Vieira2017-10-129-28/+33
* | | Merge branch '39017-gitlabusagepingworker-is-not-running-on-gitlab-com' into ...Douwe Maan2017-10-162-5/+12
|\ \ \
| * | | Make usage ping scheduling more robust39017-gitlabusagepingworker-is-not-running-on-gitlab-comSean McGivern2017-10-162-5/+12
* | | | Merge branch 'zj-add-performance-changelog-cat' into 'master'Robert Speicher2017-10-163-1/+7
|\ \ \ \
| * | | | Add Performance category to the changelogZeger-Jan van de Weg2017-10-133-1/+7
| | |_|/ | |/| |
* | | | Merge branch 'ide-update-monaco' into 'master'Jacob Schatz2017-10-164-6/+7
|\ \ \ \
| * | | | Fixes the Problem with the Repo Editor Loading Typescript Serviceside-update-monacoTim Zallmann2017-10-122-2/+3
| * | | | Upgraded MonacoTim Zallmann2017-10-052-4/+4
* | | | | Merge branch 'rc-gitlab-qa-26-add-instance-mattermost-scenario' into 'master'Grzegorz Bizon2017-10-1610-21/+87
|\ \ \ \ \
| * | | | | Move tags out to containing featureRichard Clamp2017-10-165-12/+12
| * | | | | Cleanup a stray instance variableRichard Clamp2017-10-161-1/+0
| * | | | | Explicitly tag :core and :mattermost scenariosRichard Clamp2017-10-166-15/+7
| * | | | | Move rspec cli handling logic into Specs::RunnerRichard Clamp2017-10-162-4/+15
| * | | | | Update commentRichard Clamp2017-10-131-1/+1
| * | | | | Simplify tag specificationRichard Clamp2017-10-134-13/+14
| * | | | | Fixup company nameRichard Clamp2017-10-131-1/+1
| * | | | | Add Test::Integration::MattermostRichard Clamp2017-10-136-15/+78
* | | | | | 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
| |/ / / / / / / / / /