| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Auto update docsauto-update-docs | Victor Wu | 2017-05-19 | 1 | -0/+3 |
| | | |||||
| * | Merge branch '31933-improve-rspec-profiling-enabling' into 'master' | Stan Hu | 2017-05-19 | 2 | -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-enabling | Rémy Coutable | 2017-05-19 | 2 | -2/+2 |
| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Merge branch 'add-cop-descriptions' into 'master' | Robert Speicher | 2017-05-19 | 1 | -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-descriptions | Rémy Coutable | 2017-05-19 | 1 | -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-handlers | Sean Packham (GitLab) | 2017-05-19 | 1 | -0/+4 |
| |\ \ | | | | | | | | | | | | | Add note about artifacts previewing in docs See merge request !11539 | ||||
| | * | | Add note about artifacts previewing in docsdocs/artifacts-preview | Achilleas Pipinellis | 2017-05-19 | 1 | -0/+4 |
| | | | | |||||
| * | | | Merge branch '32583-update-prometheus-merge-request-widget-documentation' ↵ | Achilleas Pipinellis | 2017-05-19 | 2 | -3/+7 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Update Prometheus Merge Request widget documentation Closes #32583 See merge request !11531 | ||||
| | * | | | Update prometheus documentation32583-update-prometheus-merge-request-widget-documentation | Joshua Lambert | 2017-05-19 | 2 | -3/+7 |
| | | | | | |||||
| * | | | | Merge branch 'zj-increase-accuracy-ps' into 'master' | Kamil Trzciński | 2017-05-19 | 1 | -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-ps | Z.J. van de Weg | 2017-05-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | Merge branch 'mr-widget-refresh-failed' into 'master' | Filipa Lacerda | 2017-05-19 | 1 | -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-failed | Fatih Acet | 2017-05-19 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | MRWidget: Change refresh button place in failed state. | Fatih Acet | 2017-05-19 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | MRWidget: Add refresh button into MR widget failed state. | Fatih Acet | 2017-05-19 | 1 | -0/+26 |
| | | | | | | |||||
| * | | | | | Merge branch 'fix/allow-accessing-appearance-images' into 'master'32603-add-docs-prometheus-sparkline-displayed-in-mr | Rémy Coutable | 2017-05-19 | 3 | -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 logo | Alexis Reigel | 2017-05-19 | 3 | -0/+46 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'dm-fix-readme-project-view' into 'master' | Dmitriy Zaporozhets | 2017-05-19 | 5 | -46/+15 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove readme project_view option See merge request !11425 | ||||
| | * | | | | | Remove readme project_view option | Douwe Maan | 2017-05-19 | 5 | -46/+15 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge branch 'dm-render-plain-readme' into 'master' | Rémy Coutable | 2017-05-19 | 2 | -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-readme | Douwe Maan | 2017-05-18 | 2 | -8/+10 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'user-avatar-vue-ce' into 'master' | Phil Hughes | 2017-05-19 | 26 | -78/+449 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate user avatar Vue logic Closes #31017 See merge request !10718 | ||||
| | * | | | | | Add s selectors for supported avatars.user-avatar-vue-ce | Bryce Johnson | 2017-05-18 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Fixes per feedback on user avatar components. | Bryce Johnson | 2017-05-18 | 7 | -92/+26 |
| | | | | | | | |||||
| | * | | | | | Consolidate user avatar Vue logic | Bryce Johnson | 2017-05-18 | 27 | -78/+513 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'fix-js-translations' into 'master' | Phil Hughes | 2017-05-19 | 6 | -11/+11 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Fix JavaScript translations that are using a namespace See merge request !11522 | ||||
| | * | | | | | Fix JavaScript translations that are using a namespacefix-js-translations | Ruben Davila | 2017-05-18 | 6 | -11/+11 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master' | Robert Speicher | 2017-05-18 | 4 | -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-missing | Douwe Maan | 2017-05-18 | 4 | -1/+11 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'dm-catch-uri-errors' into 'master' | Robert Speicher | 2017-05-18 | 3 | -1/+12 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch all URI errors in ExternalLinkFilter Closes #32076 See merge request !11494 | ||||
| | * | | | | | | Catch all URI errors in ExternalLinkFilterdm-catch-uri-errors | Douwe Maan | 2017-05-18 | 3 | -1/+12 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch 'github-oauth-self-signed-certs-troubleshooting-docs' into 'master' | Robert Speicher | 2017-05-18 | 1 | -2/+44 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add docs on how to turn off SSL verification on GH oauth See merge request !11504 | ||||
| | * | | | | | | Add docs on how to turn off SSL verification on GH oauth | Cindy Pallares 🦉 | 2017-05-18 | 1 | -2/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/323/ we added support to disable SSL verification because attempting to import projects from a self-signed GH Enterprise instance will fail with an SSL error. | ||||
| * | | | | | | | Merge branch 'delete-old-mr-widget' into 'master' | Fatih Acet | 2017-05-18 | 1 | -303/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete merge_request_widget.js See merge request !11452 | ||||
| | * | | | | | | | Delete merge_request_widget.jsdelete-old-mr-widget | Luke "Jared" Bennett | 2017-05-17 | 1 | -303/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'disable-clicking-disabled-clipboard-button' into 'master' | Phil Hughes | 2017-05-18 | 2 | -6/+29 |
| |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clicking disabled clipboard button toolip Closes #32518 See merge request !11493 | ||||
| | * | | | | | | | Fix clicking disabled clipboard button toolip | Luke "Jared" Bennett | 2017-05-18 | 2 | -6/+29 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'tc-fix-broken-plain-readme' into 'master' | Douwe Maan | 2017-05-18 | 2 | -0/+15 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ProjectCacheWorker for plain READMEs Closes #32540 See merge request !11506 | ||||
| | * | | | | | | | Fix ProjectCacheWorker for plain READMEs | Toon Claes | 2017-05-18 | 2 | -0/+15 |
| | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ProjectCacheWorker refreshes cache periodically, but it runs outside Rails context. So include the ActionView helpers so the `content_tag` method is available. | ||||
| * | | | | | | | Merge branch 'bvl-fix-incorrectly-renamed-routes' into 'master' | Douwe Maan | 2017-05-18 | 5 | -2/+51 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for the rename reserved paths helpers Closes #32528 See merge request !11492 | ||||
| | * | | | | | | | Fixes for the rename reserved paths helpers | Bob Van Landuyt | 2017-05-18 | 5 | -2/+51 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'rubocop-empty-example-group' into 'master' | Robert Speicher | 2017-05-18 | 6 | -37/+33 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the RSpec/EmptyExampleGroup cop See merge request !11497 | ||||
| | * | | | | | | | Enable the RSpec/EmptyExampleGroup coprubocop-empty-example-group | Rémy Coutable | 2017-05-18 | 6 | -37/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | Merge branch 'rubocop-expect-output' into 'master' | Robert Speicher | 2017-05-18 | 4 | -18/+15 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Enable the RSpec/ExpectOutput cop See merge request !11500 | ||||
| | * | | | | | | | Enable the RSpec/ExpectOutput coprubocop-expect-output | Rémy Coutable | 2017-05-18 | 4 | -18/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | Merge branch 'remove-services-count-from-usage-ping-data' into 'master' | Stan Hu | 2017-05-18 | 2 | -2/+0 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Services count from usage ping payload. Closes gitlab-ee#2241 See merge request !11499 | ||||
| | * | | | | | | | | Remove Services count from usage ping payload. | Ruben Davila | 2017-05-18 | 2 | -2/+0 |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This query was timing out and is blocking the sync of usage data for GitLab.com | ||||
| * | | | | | | | | Merge branch '32425-fix-diff-notes-instant-editing' into 'master' | Phil Hughes | 2017-05-18 | 2 | -3/+44 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ability to edit diff notes multiple times Closes #32425 See merge request !11456 | ||||
| | * | | | | | | | Fix ability to edit diff notes multiple times | Kushal Pandya | 2017-05-18 | 2 | -3/+44 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'winh-testing-promises' into 'master' | Clement Ho | 2017-05-18 | 1 | -0/+62 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | Document Promise testing best practice See merge request !11284 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |