summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Test svg optimizeradd-svg-optimizerClement Ho2017-05-194-548/+81
|
* Merge branch 'winh-frontend-api-users' into 'master'Clement Ho2017-05-1913-114/+419
|\ | | | | | | | | Add users endpoint to frontend API class See merge request !11374
| * Add users endpoint to frontend API classWinnie Hellmann2017-05-1913-114/+419
|/
* Merge branch 'fix-json-endpoint-redirection' into 'master'Douwe Maan2017-05-192-1/+30
|\ | | | | | | | | Bugfix: don't redirect to JSON endpoints after sign in See merge request !11561
| * Bugfix: don't redirect to JSON endpoints after sign inRuben Davila2017-05-192-1/+30
| |
* | Merge branch '32536-mr-widget-performance-improvements' into 'master'Fatih Acet2017-05-1912-28/+27
|\ \ | | | | | | | | | | | | Load improvements related to MR widget See merge request !11518
| * | Make sure fixture creation does not affect query count test32536-mr-widget-performance-improvementsOswaldo Ferreira2017-05-191-1/+4
| | |
| * | Remove routeOswaldo Ferreira2017-05-193-12/+0
| | |
| * | Fix Karma expectOswaldo Ferreira2017-05-181-1/+0
| | |
| * | Stop loading MergeRequestEntity data on sidebar requestOswaldo Ferreira2017-05-185-4/+4
| | |
| * | Remove unnecessary initial requestOswaldo Ferreira2017-05-182-2/+0
| | |
| * | Drop merge_check endpoint and use only MR show insteadOswaldo Ferreira2017-05-183-9/+20
| | |
* | | Merge branch 'winh-dropdown-ajax-cache' into 'master'Clement Ho2017-05-191-28/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use AjaxCache in Droplab Ajax plugin Closes #31897 See merge request !11171
| * | | Use AjaxCache in Droplab Ajax plugin (!11171)winh-dropdown-ajax-cachewinh2017-05-181-28/+6
| | | |
* | | | Merge branch 'fix-issue-32506' into 'master'Douwe Maan2017-05-1912-313/+645
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix redirects modifying the host Closes #32506 See merge request !11498
| * | | Refactor to more robust implementationfix-issue-32506Michael Kozono2017-05-1910-22/+272
| | | | | | | | | | | | | | | | | | | | | | | | In order to avoid string manipulation or modify route params (to make them unambiguous for `url_for`), we are accepting a behavior change: When being redirected to the canonical path for a group, if you requested a group show path starting with `/groups/…` then you’ll now be redirected to the group at root `/…`.
| * | | Fix ensure_canonical_path for top level routesMichael Kozono2017-05-184-317/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don’t replace a substring of the path if it is part of the top level route. E.g. When redirecting from `/groups/ups` to `/groups/foo`, be careful not to do `/grofoo/ups`. Projects are unaffected by this issue, but I am grouping the `#ensure_canonical_path` tests similar to the group and user tests.
| * | | Add test that fails without the fixMichael Kozono2017-05-181-0/+13
| | | |
| * | | Fix #32506Michael Kozono2017-05-181-1/+1
| | | | | | | | | | | | | | | | The host should not be modified, nor is it needed for the redirect.
* | | | 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
| | | | | | | | |