summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add auxiliary viewer for CONTRIBUTINGdm-contributing-viewerDouwe Maan2017-05-164-1/+37
* Merge branch 'dm-blob-viewer-concerns' into 'master' Robert Speicher2017-05-1617-113/+125
|\
| * Rename BlobViewer max_size to overridable_max_size and absolute_max_size to m...dm-blob-viewer-concernsDouwe Maan2017-05-159-42/+50
| * Specify explicitly whether a blob viewer should be loaded asynchronouslyDouwe Maan2017-05-1312-69/+73
| * Allow blob viewer to support multiple filetypesDouwe Maan2017-05-134-7/+7
* | Merge branch 'reenable-gitaly-ref-name' into 'master' Robert Speicher2017-05-164-33/+53
|\ \
| * | Re-enable gitaly migration for ref_name_for_sha after bugfixesreenable-gitaly-ref-nameAlejandro Rodríguez2017-05-164-33/+53
* | | Merge branch 'use-common-vue-for-merge-request-widget' into 'master' Fatih Acet2017-05-162-1/+3
|\ \ \
| * | | ensure merge-request-widget utilizes common_vue bundleuse-common-vue-for-merge-request-widgetMike Greiling2017-05-152-1/+3
* | | | Merge branch '32326-scrollable-tabs-overflow' into 'master' Annabel Dunstone Gray2017-05-162-2/+6
|\ \ \ \
| * | | | prevent dropdowns from being cut-off by scrollable tab container32326-scrollable-tabs-overflowSimon Knox2017-05-162-2/+6
* | | | | Merge branch 'modulify-and-tech-debt-gfm-auto-complete' into 'master' Clement Ho2017-05-1610-251/+270
|\ \ \ \ \
| * | | | | Make `gfm_auto_complete` into a module and fix up tech debtEric Eastwood2017-05-1610-251/+270
|/ / / / /
* | | | | Merge branch 'i18n-docs' into 'master' Achilleas Pipinellis2017-05-162-0/+243
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add guide to collaborate with i18n.Rubén Dávila Santos2017-05-162-0/+243
|/ / / /
* | | | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' Douwe Maan2017-05-165-0/+22
|\ \ \ \
| * | | | Add test.js and test.css to disable animations during testing and include the...disable-css-and-jquery-animations-for-capybaraLuke "Jared" Bennett2017-05-155-0/+22
* | | | | Merge branch 'say-bye-bye-nicescroll' into 'master' Annabel Dunstone Gray2017-05-163-13/+9
|\ \ \ \ \
| * | | | | Removes nicescroll from issuable sidebarPhil Hughes2017-05-163-13/+9
|/ / / / /
* | | | | Merge branch '31998-pipelines-empty-state' into 'master' Phil Hughes2017-05-163-16/+40
|\ \ \ \ \
| * | | | | Only renders empty state for pipelines table if no pipelines are received whe...Filipa Lacerda2017-05-163-16/+40
|/ / / / /
* | | | | Merge branch 'environments-button-open-same-tab' into 'master' Annabel Dunstone Gray2017-05-162-1/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Removed the target=_blank from the monitoring componentenvironments-button-open-same-tabJose Ivan Vargas2017-05-152-1/+5
* | | | | Merge branch 'patch-20' into 'master' Rémy Coutable2017-05-162-2/+6
|\ \ \ \ \
| * | | | | #32340 - Include mention of "manual" scope in jobs api docZac Sturgess2017-05-162-2/+6
|/ / / / /
* | | | | Merge branch 'cherry-pick-0663458c' into 'master' Douwe Maan2017-05-1625-121/+125
|\ \ \ \ \
| * | | | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458cDouwe Maan2017-05-1625-121/+125
* | | | | | Merge branch 'docs-add-more-conventions-for-docs-only-tests' into 'master' Rémy Coutable2017-05-162-8/+15
|\ \ \ \ \ \
| * | | | | | Add more choices to name the branch for docs only testsAchilleas Pipinellis2017-05-162-8/+15
* | | | | | | Merge branch 'pms-uxguide-monospace-git-refs' into 'master' Achilleas Pipinellis2017-05-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update UX guide to use monospace type for commit, branch, and tag refspms-uxguide-monospace-git-refsPedro Moreira da Silva2017-05-151-1/+1
* | | | | | | | Merge branch '31386-profile-fix-externallinks' into 'master' Douwe Maan2017-05-162-2/+20
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fixed Regex(es)Tim Zallmann2017-05-111-2/+2
| * | | | | | | Fixing Static Analysis Fail with IndentationTim Zallmann2017-05-081-2/+1
| * | | | | | | Created Application Helpers based on suggestion for easier parsingTim Zallmann2017-05-082-2/+21
| * | | | | | | Merge remote-tracking branch 'origin/31386-profile-fix-externallinks' into 31...Tim Zallmann2017-05-080-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Doing the commit again with the correct E-Mail address setup31386-profile-fix-externallinksTim Zallmann2017-04-261-2/+2
| | * | | | | | | Replacing Base URL's if they have been entered into the profileTim Zallmann2017-04-261-2/+2
| * | | | | | | | Doing the commit again with the correct E-Mail address setupTim Zallmann2017-05-081-2/+2
| * | | | | | | | Replacing Base URL's if they have been entered into the profileTim Zallmann2017-05-081-2/+2
* | | | | | | | | Merge branch 'ee_compat_check-include-git-apply-reject-suggestion' into 'mast...Rémy Coutable2017-05-161-0/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update ee_compat_check.rb to include `git apply --reject` suggestionLuke "Jared" Bennett2017-05-161-0/+11
|/ / / / / / / / /
* | | | | | | | | Merge branch '30827-changes-to-audit-log' into 'master' Phil Hughes2017-05-169-12/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Rename Personal Audit LogTim Zallmann2017-05-169-12/+17
|/ / / / / / / / /
* | | | | | | | | Merge branch 'add-right-margin-to-ci-error-icon' into 'master' Fatih Acet2017-05-162-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added ci-error class and applied a right margin to the ci error widget stateadd-right-margin-to-ci-error-iconLuke "Jared" Bennett2017-05-132-1/+5
* | | | | | | | | | Merge branch '32033-fix-login-usernamelabel' into 'master' Tim Zallmann2017-05-162-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Resolve ""Username or email" label on login form does not point to its corres...Tim Zallmann2017-05-162-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge branch 'winh-autocomplete-error' into 'master' Phil Hughes2017-05-165-54/+76
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace broken autocomplete field for new tags with dropdownWinnie Hellmann2017-05-165-54/+76
|/ / / / / / / / /