summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Restoring changefj-remove-copies-about-lfs-not-importedFrancisco Javier López2018-06-151-0/+2
* Removed copies about not syncing LFS filesFrancisco Javier López2018-06-152-4/+0
* Merge branch 'fix-flakey-user-comment-on-issue' into 'master'Sean McGivern2018-06-141-2/+5
|\
| * Fix flakey user comment on issue test race conditionEric Eastwood2018-06-141-2/+5
* | Merge branch 'author-doc-fix' into 'master'Achilleas Pipinellis2018-06-142-30/+37
|\ \
| * | Fix fields for author & assignee in MR API docs.gfyoung2018-06-132-30/+37
| |/
* | Merge branch 'cache-doc-fix' into 'master'Achilleas Pipinellis2018-06-142-10/+5
|\ \
| * | Remove incorrect CI doc re: PowerShellgfyoung2018-06-132-10/+5
| |/
* | Merge branch 'unify-simple_executor' into 'master'Douwe Maan2018-06-141-5/+25
|\ \
| * | Bring changes from EE for lib/system_check/simple_executor.rbunify-simple_executorLin Jen-Shin2018-06-141-5/+25
* | | Merge branch 'rd-33733-showing-created-date-instead-of-updated-date-in-projec...Sean McGivern2018-06-143-0/+10
|\ \ \
| * | | Invalidate cache with project details when repository is updatedrd-33733-showing-created-date-instead-of-updated-date-in-project-listsRubén Dávila2018-06-133-0/+10
* | | | Merge branch 'assignee-lists-tiers-docs' into 'master'Sean McGivern2018-06-141-6/+6
|\ \ \ \
| * | | | Add assignee lists to tiers table in docsassignee-lists-tiers-docsVictor Wu2018-06-131-6/+6
* | | | | Merge branch 'jprovazn-rails5-shoulda' into 'master'Rémy Coutable2018-06-141-0/+27
|\ \ \ \ \
| * | | | | Fix shoulda-matchers in Rails 5jprovazn-rails5-shouldaJan Provaznik2018-06-131-0/+27
* | | | | | Merge branch 'ide-pipeline-error-wrap' into 'master'Filipa Lacerda2018-06-141-1/+1
|\ \ \ \ \ \
| * | | | | | Wrap YAML error in Web IDE pipelines panelide-pipeline-error-wrapPhil Hughes2018-06-131-1/+1
* | | | | | | Merge branch 'bw-enable-commonmark' into 'master'Sean McGivern2018-06-1414-86/+195
|\ \ \ \ \ \ \
| * | | | | | | enable CommonMark as the defaultBrett Walker2018-06-1414-86/+195
|/ / / / / / /
* | | | | | | Merge branch 'docs-coached-20180613-1' into 'master'Achilleas Pipinellis2018-06-141-6/+6
|\ \ \ \ \ \ \
| * | | | | | | fixed university curr anchorsEdwin Torres2018-06-131-6/+6
| * | | | | | | fixed university curr anchorsEdwin Torres2018-06-131-6/+6
| * | | | | | | fixed university curr anchorsEdwin Torres2018-06-131-5/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'rails5-fix-47805' into 'master'Rémy Coutable2018-06-142-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Rails5 ActionController::ParameterMissing: param is missing or the value is e...Jasper Maes2018-06-132-1/+7
* | | | | | | | Merge branch 'rails5-fix-47835' into 'master'Rémy Coutable2018-06-142-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Rails5 fix no implicit conversion of Hash into String. ActionController::Para...Jasper Maes2018-06-132-1/+8
* | | | | | | | | Merge branch 'rails5-fix-47804' into 'master'Rémy Coutable2018-06-142-4/+9
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Rails5 fix stack level too deepJasper Maes2018-06-132-4/+9
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'winh-new-branch-url-encode' into 'master'Mike Greiling2018-06-133-16/+107
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix branch name encoding for dropdown on issue pageWinnie Hellmann2018-06-133-16/+107
|/ / / / / / / /
* | | | | | | | Merge branch 'jivl-remove-remaining-btn-xs-class-usage' into 'master'Annabel Gray2018-06-138-23/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove the btn-xs class from the stylesheetsJose2018-06-138-23/+5
| |/ / / / / / /
* | | | | | | | Merge branch '47830-merge-request-diff-loading-icon-not-visible' into 'master'Annabel Gray2018-06-131-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix loading icon for mr tabsClement Ho2018-06-131-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jivl-fix-repository-instruction-wrapping-text' into 'master'Clement Ho2018-06-131-4/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Remove card class from the git-empty containersJose2018-06-131-4/+4
| |/ / / / / /
* | | | | | | Merge branch 'unify-parallel_importer' into 'master'Stan Hu2018-06-131-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Bring changes from EE for parallel_importer.rbLin Jen-Shin2018-06-141-0/+9
* | | | | | | | Merge branch 'rosulk-patch-12' into 'master'Clement Ho2018-06-132-5/+11
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Flex board columnsPaul Slaughter2018-06-132-5/+11
|/ / / / / / /
* | | | | | | Merge branch 'bvl-missing-message-on-access-denied' into 'master'Robert Speicher2018-06-134-3/+22
|\ \ \ \ \ \ \
| * | | | | | | Render access denied without messageBob Van Landuyt2018-06-134-3/+22
* | | | | | | | Merge branch 'mk/rake-task-verify-remote-files' into 'master'Stan Hu2018-06-1310-41/+147
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add support for verifying remote uploads, artifacts, and LFS objects in check...Michael Kozono2018-06-1310-41/+147
|/ / / / / / /
* | | | | | | Merge branch 'qa-clear-session-only-if-block-given-and-no-errors' into 'master'Rémy Coutable2018-06-131-13/+1
|\ \ \ \ \ \ \
| * | | | | | | Only clear the sessions if block_given? and no errorLin Jen-Shin2018-06-131-13/+1
* | | | | | | | Merge branch 'ab-document-migration-needs-changelog' into 'master'Yorick Peterse2018-06-131-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Database migrations should have a changelog entry.Andreas Brandl2018-06-131-0/+2
|/ / / / / / / /