summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Exclude manual actions from cancelable jobs scopefix/gb/exclude-manual-actions-from-cancelable-jobsGrzegorz Bizon2017-05-193-1/+15
|
* Merge branch 'auto-update-docs' into 'master'Clement Ho2017-05-191-0/+3
|\ | | | | | | | | Auto update docs See merge request !11552
| * Auto update docsauto-update-docsVictor Wu2017-05-191-0/+3
| |
* | Merge branch 'update-retried-migration' into 'master'Rémy Coutable2017-05-191-14/+28
|\ \ | | | | | | | | | | | | | | | | | | Add temporary partial index to speed up the migration Closes #32469 See merge request !11534
| * | Add temporary partial index to speed up the migrationupdate-retried-migrationLin Jen-Shin2017-05-191-14/+28
| | | | | | | | | | | | Closes #32469
* | | Merge branch '32595-fix-vertical-misalignment-mr-widget' into 'master'Filipa Lacerda2017-05-194-3/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Refine MR widget styling for buttons and info text Closes #32595 See merge request !11548
| * | | Refine MR widget styling for buttons and info textKushal Pandya2017-05-194-3/+19
|/ / /
* | | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵Filipa Lacerda2017-05-194-17/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix system note comparison and standardize note setup Closes #32551 See merge request !11532
| * | | Fix system note comparison and standardize note setupEric Eastwood2017-05-194-17/+32
| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551
* | | | Merge branch '32602-add-docs-for-remove-filter-in-search-bar' into 'master'Achilleas Pipinellis2017-05-193-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for "Remove Filter in Search Bar" Closes #32602 See merge request !11541
| * | | | Add docs for "Remove Filter in Search Bar"Sean Packham (GitLab)2017-05-193-2/+6
|/ / / /
* | | | Merge branch '32556-side-by-side-mr-discussion-should-stretch-to-max-width' ↵Annabel Dunstone Gray2017-05-191-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Side by side MR discussion should stretch to max width" Closes #32556 See merge request !11508
| * | | | Remove width limit from discussion notes32556-side-by-side-mr-discussion-should-stretch-to-max-widthClement Ho2017-05-191-1/+0
| | | | |
* | | | | Merge branch 'winh-testing-promises-docs' into 'master'Clement Ho2017-05-191-6/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Minor changes to Testing Promises section See merge request !11517
| * | | | | Minor changes to Testing Promises sectionwinh-testing-promises-docspatch-20Winnie Hellmann2017-05-181-6/+7
| | |/ / / | |/| | |
* | | | | Merge branch 'patch-21' into 'master'Clement Ho2017-05-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wording in settings / CI/CD Pipelines Closes #32555 See merge request !11516
| * | | | | Update edit.html.hamlpatch-21Fabio Busatto2017-05-181-1/+1
| | | | | | | | | | | | | | | | | | Closes #32555
* | | | | | Merge branch 'fix-header-z-index' into 'master'Annabel Dunstone Gray2017-05-191-2/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced duplicate z-index with index of 400 Closes #32609 See merge request !11547
| * | | | | Replaced duplicate z-index with index of 400Luke "Jared" Bennett2017-05-191-2/+1
|/ / / / /
* | | | | Merge branch '31933-improve-rspec-profiling-enabling' into 'master'Stan Hu2017-05-192-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable RSpec profiling only if RSPEC_PROFILING_POSTGRES_URL is not empty Closes #31933 See merge request !11543
| * | | | | Enable RSpec profiling only if RSPEC_PROFILING_POSTGRES_URL is not empty31933-improve-rspec-profiling-enablingRémy Coutable2017-05-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'add-cop-descriptions' into 'master'Robert Speicher2017-05-191-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add descriptions for the RSpec/EmptyExampleGroup and RSpec/ExpectOutput cops [ci skip] See merge request !11540
| * | | | | | Add descriptions for the RSpec/EmptyExampleGroup and RSpec/ExpectOutput copsadd-cop-descriptionsRémy Coutable2017-05-191-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'docs/artifacts-preview' into 'master'32612-decide-on-and-document-a-convention-for-passing-context-to-event-handlersSean Packham (GitLab)2017-05-191-0/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Add note about artifacts previewing in docs See merge request !11539
| * | | | | Add note about artifacts previewing in docsdocs/artifacts-previewAchilleas Pipinellis2017-05-191-0/+4
| | | | | |
* | | | | | Merge branch '32583-update-prometheus-merge-request-widget-documentation' ↵Achilleas Pipinellis2017-05-192-3/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update Prometheus Merge Request widget documentation Closes #32583 See merge request !11531
| * | | | | | Update prometheus documentation32583-update-prometheus-merge-request-widget-documentationJoshua Lambert2017-05-192-3/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'zj-increase-accuracy-ps' into 'master'Kamil Trzciński2017-05-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the schedule worker once an hour by default See merge request !11476
| * | | | | | Run the schedule worker once an hour by defaultzj-increase-accuracy-psZ.J. van de Weg2017-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'mr-widget-refresh-failed' into 'master'Filipa Lacerda2017-05-191-1/+27
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add refresh button into MR widget failed state. Closes #32543 See merge request !11519
| * | | | | | MRWidget: Make error message bold and red.mr-widget-refresh-failedFatih Acet2017-05-191-1/+1
| | | | | | |
| * | | | | | MRWidget: Change refresh button place in failed state.Fatih Acet2017-05-191-3/+3
| | | | | | |
| * | | | | | MRWidget: Add refresh button into MR widget failed state.Fatih Acet2017-05-191-0/+26
| | | | | | |
* | | | | | | Merge branch 'fix/allow-accessing-appearance-images' into 'master'32603-add-docs-prometheus-sparkline-displayed-in-mrRémy Coutable2017-05-193-0/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the 500 for custom apearance header logo and logo See merge request !11479
| * | | | | | | Fixes the 500 for custom apearance header logo and logoAlexis Reigel2017-05-193-0/+46
|/ / / / / / /
* | | | | | | Merge branch 'dm-fix-readme-project-view' into 'master'Dmitriy Zaporozhets2017-05-195-46/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove readme project_view option See merge request !11425
| * | | | | | | Remove readme project_view optionDouwe Maan2017-05-195-46/+15
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'dm-render-plain-readme' into 'master'Rémy Coutable2017-05-192-8/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render plain README using Markup viewer so it is displayed below tree See merge request !11510
| * | | | | | | Render plain README using Markup viewer so it is displayed below treedm-render-plain-readmeDouwe Maan2017-05-182-8/+10
| | | | | | | |
* | | | | | | | Merge branch 'user-avatar-vue-ce' into 'master'Phil Hughes2017-05-1926-78/+449
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate user avatar Vue logic Closes #31017 See merge request !10718
| * | | | | | | Add s selectors for supported avatars.user-avatar-vue-ceBryce Johnson2017-05-181-0/+2
| | | | | | | |
| * | | | | | | Fixes per feedback on user avatar components.Bryce Johnson2017-05-187-92/+26
| | | | | | | |
| * | | | | | | Consolidate user avatar Vue logicBryce Johnson2017-05-1827-78/+513
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fix-js-translations' into 'master'Phil Hughes2017-05-196-11/+11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Fix JavaScript translations that are using a namespace See merge request !11522
| * | | | | | Fix JavaScript translations that are using a namespacefix-js-translationsRuben Davila2017-05-186-11/+11
|/ / / / / /
* | | | | | Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master'Robert Speicher2017-05-184-1/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop MR conflict code from blowing up when branches are missing Closes #32544 See merge request !11501
| * | | | | | Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-184-1/+11
| | | | | | |
* | | | | | | Merge branch 'dm-catch-uri-errors' into 'master'Robert Speicher2017-05-183-1/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch all URI errors in ExternalLinkFilter Closes #32076 See merge request !11494
| * | | | | | | Catch all URI errors in ExternalLinkFilterdm-catch-uri-errorsDouwe Maan2017-05-183-1/+12
| |/ / / / / /
* | | | | | | Merge branch 'github-oauth-self-signed-certs-troubleshooting-docs' into 'master'Robert Speicher2017-05-181-2/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs on how to turn off SSL verification on GH oauth See merge request !11504