summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bring back section on nightly triggers and mention schedulesdocs/refactor-pipeline-schedulesAchilleas Pipinellis2017-05-171-3/+17
|
* Change location of pipeline schedule docsAchilleas Pipinellis2017-05-175-1/+2
|
* Copyedit pipelines schedules docsAchilleas Pipinellis2017-05-173-23/+41
|
* Merge branch 'sh-fix-delete-assignees-mysql' into 'master' Stan Hu2017-05-171-4/+9
|\ | | | | | | | | Fix deletion of issue assignees for MySQL See merge request !11426
| * Fix deletion of issue assignees for MySQLsh-fix-delete-assignees-mysqlStan Hu2017-05-161-4/+9
|/ | | | | MySQL builds on EE were failing due to MySQL not liking the complex subqueries. Simplify the deletion to use a subquery that works.
* Merge branch 'fe_guide-index-ascii-tree' into 'master' 22306-can-t-disable-project-services-trigger-or-unset-defined-channel-name-via-apiClement Ho2017-05-161-9/+5
|\ | | | | | | | | | | | | Update fe_guide/index.md to use readable ascii tree Closes #31330 See merge request !11423
| * Update fe_guide/index.md to use readable ascii treefe_guide-index-ascii-treeLuke "Jared" Bennett2017-05-161-9/+5
| |
* | Merge branch 'ability_to_cancel_attaching_file' into 'master' Douwe Maan2017-05-167-117/+330
|\ \ | | | | | | | | | | | | | | | | | | Add an ability to cancel attaching file and redesign attaching files UI Closes #15611, #24270, and #28905 See merge request !9431
| * | Add an ability to cancel attaching file and redesign attaching files UIblackst0ne2017-05-167-117/+330
| | |
* | | Merge branch 'sh-disable-merge-worker-in-spec' into 'master' Robert Speicher2017-05-161-3/+5
|\ \ \ | | | | | | | | | | | | | | | | Disable Sidekiq in merge immediately spec to prevent transient build failures See merge request !11422
| * | | Wait for all Vue resources to finish in merge immediately specsh-disable-merge-worker-in-specStan Hu2017-05-161-1/+1
| | | |
| * | | Disable Sidekiq in spec to prevent transient build failuresStan Hu2017-05-161-3/+5
| | |/ | |/|
* | | Merge branch 'fix_assignee_yourick_approach' into 'master' Douwe Maan2017-05-168-54/+206
|\ \ \ | |/ / |/| | | | | | | | Improve migration for Multipple issue assignee feature See merge request !11417
| * | Improve migration for Multipple issue assignee featureValery Sizov2017-05-168-54/+206
| | |
* | | Merge branch 'dm-blob-viewer-concerns' into 'master' Robert Speicher2017-05-1617-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-concernsDouwe Maan2017-05-159-42/+50
| | | | | | | | | | | | | | | | max_size
| * | | 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 bugfixes See merge request !11310
| * | | | 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 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-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 container Closes #32328 and #32326 See merge request !11399
| * | | | | | prevent dropdowns from being cut-off by scrollable tab container32326-scrollable-tabs-overflowSimon Knox2017-05-162-2/+6
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | rerender scrollable-tab area after Resolve Discussions button is rendered
* | | | | | 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 debt See merge request !11065
| * | | | | | 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. See merge request !11196
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-capybaraLuke "Jared" Bennett2017-05-155-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | these in _head when testing
* | | | | | Merge branch 'say-bye-bye-nicescroll' into 'master' Annabel Dunstone Gray2017-05-163-13/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes nicescroll from issuable sidebar See merge request !10831
| * | | | | | 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 when request is made Closes #31998 See merge request !11405
| * | | | | | Only renders empty state for pipelines table if no pipelines are received ↵Filipa Lacerda2017-05-163-16/+40
|/ / / / / / | | | | | | | | | | | | | | | | | | when request is made
* | | | | | Merge branch 'environments-button-open-same-tab' into 'master' Annabel Dunstone Gray2017-05-162-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-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 doc Closes #32340 See merge request !11411
| * | | | | | #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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0663458cDouwe Maan2017-05-1625-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 Coutable2017-05-162-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 testsAchilleas Pipinellis2017-05-162-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://rubular.com/r/51mKdLm6RF
* | | | | | | | 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 refs See merge request !11342
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make Twitter Link on Profile page useable by fixing wrong target URL's" Closes #31386 See merge request !10931
| * | | | | | | | 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 ↵Tim Zallmann2017-05-080-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31386-profile-fix-externallinks
| | * | | | | | | | Doing the commit again with the correct E-Mail address setup31386-profile-fix-externallinksTim Zallmann2017-04-261-2/+2
| | | | | | | | | |