Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Wait for all Vue resources to finish in merge immediately specsh-disable-merge-worker-in-spec | Stan Hu | 2017-05-16 | 1 | -1/+1 |
| | |||||
* | Disable Sidekiq in spec to prevent transient build failures | Stan Hu | 2017-05-16 | 1 | -3/+5 |
| | |||||
* | Merge branch 'dm-blob-viewer-concerns' into 'master' | Robert Speicher | 2017-05-16 | 17 | -113/+125 |
|\ | | | | | | | | | Move some blob viewer stuff around without changing behavior See merge request !11358 | ||||
| * | Rename BlobViewer max_size to overridable_max_size and absolute_max_size to ↵dm-blob-viewer-concerns | Douwe Maan | 2017-05-15 | 9 | -42/+50 |
| | | | | | | | | max_size | ||||
| * | Specify explicitly whether a blob viewer should be loaded asynchronously | Douwe Maan | 2017-05-13 | 12 | -69/+73 |
| | | |||||
| * | Allow blob viewer to support multiple filetypes | Douwe Maan | 2017-05-13 | 4 | -7/+7 |
| | | |||||
* | | Merge branch 'reenable-gitaly-ref-name' into 'master' | Robert Speicher | 2017-05-16 | 4 | -33/+53 |
|\ \ | | | | | | | | | | | | | Re-enable gitaly migration for ref_name_for_sha after bugfixes See merge request !11310 | ||||
| * | | Re-enable gitaly migration for ref_name_for_sha after bugfixesreenable-gitaly-ref-name | Alejandro Rodríguez | 2017-05-16 | 4 | -33/+53 |
| | | | |||||
* | | | Merge branch 'use-common-vue-for-merge-request-widget' into 'master' | Fatih Acet | 2017-05-16 | 2 | -1/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | Ensure vue_merge_request_widget utilizes common_vue bundle See merge request !11269 | ||||
| * | | | ensure merge-request-widget utilizes common_vue bundleuse-common-vue-for-merge-request-widget | Mike Greiling | 2017-05-15 | 2 | -1/+3 |
| | | | | |||||
* | | | | Merge branch '32326-scrollable-tabs-overflow' into 'master' | Annabel Dunstone Gray | 2017-05-16 | 2 | -2/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent dropdowns from being cut-off by scrollable tab container Closes #32328 and #32326 See merge request !11399 | ||||
| * | | | | prevent dropdowns from being cut-off by scrollable tab container32326-scrollable-tabs-overflow | Simon Knox | 2017-05-16 | 2 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | rerender scrollable-tab area after Resolve Discussions button is rendered | ||||
* | | | | | Merge branch 'modulify-and-tech-debt-gfm-auto-complete' into 'master' | Clement Ho | 2017-05-16 | 10 | -251/+270 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Make `gfm_auto_complete` into a module and fix up tech debt See merge request !11065 | ||||
| * | | | | | Make `gfm_auto_complete` into a module and fix up tech debt | Eric Eastwood | 2017-05-16 | 10 | -251/+270 |
|/ / / / / | |||||
* | | | | | Merge branch 'i18n-docs' into 'master' | Achilleas Pipinellis | 2017-05-16 | 2 | -0/+243 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Add guide to collaborate with i18n. See merge request !11196 | ||||
| * | | | | Add guide to collaborate with i18n. | Rubén Dávila Santos | 2017-05-16 | 2 | -0/+243 |
|/ / / / | |||||
* | | | | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' | Douwe Maan | 2017-05-16 | 5 | -0/+22 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disable animations for tests Closes #32194 See merge request !11324 | ||||
| * | | | | Add test.js and test.css to disable animations during testing and include ↵disable-css-and-jquery-animations-for-capybara | Luke "Jared" Bennett | 2017-05-15 | 5 | -0/+22 |
| | | | | | | | | | | | | | | | | | | | | these in _head when testing | ||||
* | | | | | Merge branch 'say-bye-bye-nicescroll' into 'master' | Annabel Dunstone Gray | 2017-05-16 | 3 | -13/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Removes nicescroll from issuable sidebar See merge request !10831 | ||||
| * | | | | | Removes nicescroll from issuable sidebar | Phil Hughes | 2017-05-16 | 3 | -13/+9 |
|/ / / / / | |||||
* | | | | | Merge branch '31998-pipelines-empty-state' into 'master' | Phil Hughes | 2017-05-16 | 3 | -16/+40 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only renders empty state for pipelines table if no pipelines are received when request is made Closes #31998 See merge request !11405 | ||||
| * | | | | | Only renders empty state for pipelines table if no pipelines are received ↵ | Filipa Lacerda | 2017-05-16 | 3 | -16/+40 |
|/ / / / / | | | | | | | | | | | | | | | | when request is made | ||||
* | | | | | Merge branch 'environments-button-open-same-tab' into 'master' | Annabel Dunstone Gray | 2017-05-16 | 2 | -1/+5 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Removed the target=_blank from the monitoring component Closes #32243 See merge request !11386 | ||||
| * | | | | Removed the target=_blank from the monitoring componentenvironments-button-open-same-tab | Jose Ivan Vargas | 2017-05-15 | 2 | -1/+5 |
| | | | | | |||||
* | | | | | Merge branch 'patch-20' into 'master' | Rémy Coutable | 2017-05-16 | 2 | -2/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #32340 - Include mention of "manual" scope in jobs api doc Closes #32340 See merge request !11411 | ||||
| * | | | | | #32340 - Include mention of "manual" scope in jobs api doc | Zac Sturgess | 2017-05-16 | 2 | -2/+6 |
|/ / / / / | |||||
* | | | | | Merge branch 'cherry-pick-0663458c' into 'master' | Douwe Maan | 2017-05-16 | 25 | -121/+125 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events`, take 2. Closes #31620 See merge request !11403 | ||||
| * | | | | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458c | Douwe Maan | 2017-05-16 | 25 | -121/+125 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287 | ||||
* | | | | | | Merge branch 'docs-add-more-conventions-for-docs-only-tests' into 'master' | Rémy Coutable | 2017-05-16 | 2 | -8/+15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more choices to name the branch for docs only tests See merge request !11413 | ||||
| * | | | | | | Add more choices to name the branch for docs only tests | Achilleas Pipinellis | 2017-05-16 | 2 | -8/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://rubular.com/r/51mKdLm6RF | ||||
* | | | | | | | Merge branch 'pms-uxguide-monospace-git-refs' into 'master' | Achilleas Pipinellis | 2017-05-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update UX guide to use monospace type for commit, branch, and tag refs See merge request !11342 | ||||
| * | | | | | | | Update UX guide to use monospace type for commit, branch, and tag refspms-uxguide-monospace-git-refs | Pedro Moreira da Silva | 2017-05-15 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '31386-profile-fix-externallinks' into 'master' | Douwe Maan | 2017-05-16 | 2 | -2/+20 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make Twitter Link on Profile page useable by fixing wrong target URL's" Closes #31386 See merge request !10931 | ||||
| * | | | | | | | Fixed Regex(es) | Tim Zallmann | 2017-05-11 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Fixing Static Analysis Fail with Indentation | Tim Zallmann | 2017-05-08 | 1 | -2/+1 |
| | | | | | | | | |||||
| * | | | | | | | Created Application Helpers based on suggestion for easier parsing | Tim Zallmann | 2017-05-08 | 2 | -2/+21 |
| | | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/31386-profile-fix-externallinks' into ↵ | Tim Zallmann | 2017-05-08 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31386-profile-fix-externallinks | ||||
| | * | | | | | | | Doing the commit again with the correct E-Mail address setup31386-profile-fix-externallinks | Tim Zallmann | 2017-04-26 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | Replacing Base URL's if they have been entered into the profile | Tim Zallmann | 2017-04-26 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Doing the commit again with the correct E-Mail address setup | Tim Zallmann | 2017-05-08 | 1 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Replacing Base URL's if they have been entered into the profile | Tim Zallmann | 2017-05-08 | 1 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'ee_compat_check-include-git-apply-reject-suggestion' into ↵ | Rémy Coutable | 2017-05-16 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update ee_compat_check.rb to include `git apply --reject` suggestion See merge request !11321 | ||||
| * | | | | | | | | | Update ee_compat_check.rb to include `git apply --reject` suggestion | Luke "Jared" Bennett | 2017-05-16 | 1 | -0/+11 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch '30827-changes-to-audit-log' into 'master' | Phil Hughes | 2017-05-16 | 9 | -12/+17 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Personal Audit Log Closes #30827 See merge request !11400 | ||||
| * | | | | | | | | | Rename Personal Audit Log | Tim Zallmann | 2017-05-16 | 9 | -12/+17 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'add-right-margin-to-ci-error-icon' into 'master' | Fatih Acet | 2017-05-16 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added ci-error class and applied a right margin to the ci error widget state See merge request !11353 | ||||
| * | | | | | | | | | Added ci-error class and applied a right margin to the ci error widget stateadd-right-margin-to-ci-error-icon | Luke "Jared" Bennett | 2017-05-13 | 2 | -1/+5 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch '32033-fix-login-usernamelabel' into 'master' | Tim Zallmann | 2017-05-16 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""Username or email" label on login form does not point to its corresponding input field" Closes #32033, #31709, and #32034 See merge request !11292 | ||||
| * | | | | | | | | | Resolve ""Username or email" label on login form does not point to its ↵ | Tim Zallmann | 2017-05-16 | 2 | -3/+3 |
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | corresponding input field" | ||||
* | | | | | | | | | Merge branch 'winh-autocomplete-error' into 'master' | Phil Hughes | 2017-05-16 | 5 | -54/+76 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace broken autocomplete field for new tags with dropdown Closes #32127 See merge request !11290 |