| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Don't force the encoding of the OAuth provider in ↵37845-fix-oauth-provider-forced-encoding | Rémy Coutable | 2017-09-14 | 2 | -5/+4 |
| | | | | | | | | | | | | | | | | Gitlab::OAuth::AuthHash#provider Some providers freeze their name (e.g. https://github.com/zquestz/omniauth-google-oauth2/blob/414c43ef3ffec37d473321f262e80f1e46dda89f/lib/omniauth/strategies/google_oauth2.rb#L1), so trying to modify the string would fail with a `can't modify frozen String` exception (see https://gitlab.com/gitlab-org/gitlab-ce/issues/37845#note_40308148). In this case, we can just stop trying to force the encoding of the provider name as they should always be in utf8 by default. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch 'sub-group-dropdown-width' into 'master' | Annabel Dunstone Gray | 2017-09-14 | 1 | -3/+3 |
| |\ | | | | | | | | | | | | | Fixed width of sub-group in breadcrumb dropdown Closes #37745 See merge request !14210 | ||||
| | * | Fixed width of sub-group in breadcrumb dropdownsub-group-dropdown-width | Phil Hughes | 2017-09-13 | 1 | -3/+3 |
| | | | | | | | | | Closes #37745 | ||||
| * | | Merge branch 'fix_default_navigation_theme_selection' into 'master' | Robert Speicher | 2017-09-13 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Fix default navigation theme selection Closes #37777 See merge request !14260 | ||||
| | * | | Fix the default navigation theme selection on invalid id | Vitaliy @blackst0ne Klachkov | 2017-09-14 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'repo-editor-ui-fix' into 'master' | Jacob Schatz | 2017-09-13 | 2 | -2/+14 |
| |\ \ | | | | | | | | | | | | | | | | | | | Several repo editor fixes Closes #36128, #36240, and #37733 See merge request !14126 | ||||
| | * | | RepoEditor: Fix markdown preview rendering. | Fatih Acet | 2017-09-13 | 1 | -2/+2 |
| | | | | |||||
| | * | | RepoEditor: Fix active line hilite color. | Fatih Acet | 2017-09-13 | 1 | -0/+5 |
| | | | | |||||
| | * | | RepoEditor: Fix empty state for image blob view. | Fatih Acet | 2017-09-13 | 2 | -1/+8 |
| |/ / | |||||
| * | | Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master' | Rémy Coutable | 2017-09-13 | 2 | -4/+30 |
| |\ \ | |/ |/| | | | | | Backport more EE changes to Gitlab::UrlSanitizer See merge request !14150 | ||||
| | * | Backport more EE changes to Gitlab::UrlSanitizer | Nick Thomas | 2017-09-11 | 2 | -4/+30 |
| | | | |||||
| * | | Merge branch 'revert-373ff978' into 'master' | Stan Hu | 2017-09-13 | 1 | -0/+57 |
| |\ \ | | | | | | | | | | | | | Revert "Merge branch 'rs-remove-bad-foreground-migration' into 'master'" See merge request !14253 | ||||
| | * | | Revert "Merge branch 'rs-remove-bad-foreground-migration' into 'master'" | Robert Speicher | 2017-09-13 | 1 | -0/+57 |
| | | | | | | | | | | This reverts merge request !14240 | ||||
| * | | | Merge branch 'docs-gitaly-client-config' into 'master' | Achilleas Pipinellis | 2017-09-13 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | Fix Ruby syntax error in Gitaly config example See merge request !14208 | ||||
| | * | | | Fix Ruby syntax error in Gitaly config exampledocs-gitaly-client-config | Jacob Vosmaer | 2017-09-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'ce-backport-new-sidebar-boards' into 'master' | Filipa Lacerda | 2017-09-13 | 3 | -8/+24 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | CE backport of new-sidebar-boards See merge request !14246 | ||||
| | * | | | CE backport of new-sidebar-boardsce-backport-new-sidebar-boards | Phil Hughes | 2017-09-13 | 3 | -8/+24 |
| | | | | | |||||
| * | | | | Merge branch 'sh-exclude-api-responses' into 'master' | Robert Speicher | 2017-09-13 | 1 | -1/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Exclude logging of API responses to prevent leakage of confidential data See merge request !14245 | ||||
| | * | | | | Exclude logging of API responses to prevent leakage of confidential datash-exclude-api-responses | Stan Hu | 2017-09-13 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'backstage/gb/optimize-some-specs-with-rspec-set' into 'master' | Rémy Coutable | 2017-09-13 | 8 | -41/+59 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Optimize some tests with RSpec Set See merge request !14047 | ||||
| | * | | | | | Fix job coverage specsbackstage/gb/optimize-some-specs-with-rspec-set | Grzegorz Bizon | 2017-09-13 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Fix build specs after using `set` instead of `let` | Grzegorz Bizon | 2017-09-13 | 1 | -13/+22 |
| | | | | | | | |||||
| | * | | | | | Fix syntax error in LFS objects specs | Grzegorz Bizon | 2017-09-13 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Optimize CI/CD build retry service specs | Grzegorz Bizon | 2017-09-13 | 1 | -4/+5 |
| | | | | | | | |||||
| | * | | | | | Optimize CI/CD build model specs | Grzegorz Bizon | 2017-09-13 | 1 | -8/+5 |
| | | | | | | | |||||
| | * | | | | | Optimize generic specs for services | Grzegorz Bizon | 2017-09-13 | 1 | -6/+7 |
| | | | | | | | |||||
| | * | | | | | Optimize a few simple spec files by using `set` | Grzegorz Bizon | 2017-09-13 | 4 | -6/+9 |
| | | | | | | | |||||
| | * | | | | | Optimize LFS objects specs | Grzegorz Bizon | 2017-09-13 | 1 | -4/+11 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'refactor-monitoring-service' into 'master' | Phil Hughes | 2017-09-13 | 3 | -54/+61 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor MonitoringService class See merge request !14003 | ||||
| | * | | | | | | Refactor MonitoringService class | Mike Greiling | 2017-09-13 | 3 | -54/+61 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'patch-26' into 'master' | Rémy Coutable | 2017-09-13 | 1 | -3/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete duplicated lines. See merge request !14180 | ||||
| | * | | | | | | Delete duplicated lines. | Shinichi Maeshima | 2017-09-11 | 1 | -3/+0 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch '18308-escape-characters' into 'master' | Rémy Coutable | 2017-09-13 | 3 | -1/+17 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape characters in git user name Closes #18308 See merge request !14020 | ||||
| | * | | | | | | | escape characters in git user name | Brandon Everett | 2017-09-13 | 3 | -1/+17 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch ↵ | Kamil Trzciński | 2017-09-13 | 3 | -1/+9 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variables' into 'master' Fix `ci_builds` to have an associated `trigger_request_id` See merge request !14244 | ||||
| | * | | | | | | | Add change log. Fix spec.fix/sm/37559-pipeline-triggered-through-api-not-showing-trigger-variables | Shinya Maeda | 2017-09-13 | 2 | -1/+7 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix PipelineTriggerService to associate trigger_request with builds | Shinya Maeda | 2017-09-13 | 2 | -1/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'zj-auto-devops-banner' into 'master' | Kamil Trzciński | 2017-09-13 | 3 | -1/+25 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AutoDevOps banner hidden on explicit CI config Closes #37652 See merge request !14207 | ||||
| | * | | | | | | | | Fix extra space in YAML array | Zeger-Jan van de Weg | 2017-09-13 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | AutoDevOps banner hidden on explicit CI config | Zeger-Jan van de Weg | 2017-09-13 | 3 | -1/+25 |
| | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends the helper method to no show the banner as soon as the project has a `.gitlab-ci.yml` file on the default branch. Fixes gitlab-org/gitlab-ce#37652 | ||||
| * | | | | | | | | Merge branch 'fix/gpg-tmp-dir-removal-race-condition' into 'master' | Rémy Coutable | 2017-09-13 | 2 | -4/+15 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix: GPG tmp dir removal race condition Ignore any errors when removing the tmp directory, as we may run into a race condition: The `gpg-agent` agent process may clean up some files as well while `FileUtils.remove_entry` is iterating the directory and removing all its contained files and directories recursively, which could raise an error. Closes #36998 See merge request !14194 | ||||
| | * | | | | | | | | Fix: GPG tmp dir removal race condition | Alexis Reigel | 2017-09-13 | 2 | -4/+15 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'replace_profile_active_tab.feature' into 'master' | Rémy Coutable | 2017-09-13 | 8 | -58/+79 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Replace the 'profile/active_tab.feature' spinach test with an rspec analog See merge request !14239 | ||||
| | * | | | | | | | Replace the 'profile/active_tab.feature' spinach test with an rspec analog | Vitaliy @blackst0ne Klachkov | 2017-09-13 | 8 | -58/+79 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch ↵ | Douwe Maan | 2017-09-13 | 4 | -1/+27 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37629-lazy-image-loading-breaks-notification-mails-for-an-added-screenshot' into 'master' Resolve "Lazy image loading breaks notification mails for an added screenshot" Closes #37629 See merge request !14161 | ||||
| | * | | | | | | | Remove ImageLazyLoadFilter from EmailPipeline37629-lazy-image-loading-breaks-notification-mails-for-an-added-screenshot | Robert Speicher | 2017-09-12 | 4 | -1/+27 |
| | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'docs-inherit-milestone-labels-new-mr' into 'master' | Douwe Maan | 2017-09-13 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | Docs for automatically inherit the milestone and labels of the issue See merge request !14223 | ||||
| | * | | | | | | Automatically inherit the milestone and labels of the issuedocs-inherit-milestone-labels-new-mr | Victor Wu | 2017-09-12 | 1 | -1/+2 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch 'fix-doorkeeper-failure' into 'master' | Rémy Coutable | 2017-09-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the Doorkeeper.optional_scopes issue triggered by !13314 Closes #37753 See merge request !14219 | ||||
| | * | | | | | | Fix doorkeeper failure | Kamil Trzciński | 2017-09-13 | 1 | -1/+1 |
| |/ / / / / / | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |