Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Explain render_if_exists opts caveatdocs-render_if_exists-opts-caveat | Luke Bennett | 2019-05-16 | 1 | -1/+13 |
* | Merge branch 'disallow-review-deploy-to-fail' into 'master' | Sean McGivern | 2019-05-16 | 1 | -3/+2 |
|\ | |||||
| * | Disallow the review-deploy and review-qa-smoke jobs to faildisallow-review-deploy-to-fail | Rémy Coutable | 2019-05-15 | 1 | -3/+2 |
* | | Merge branch 'reg-captcha-flag' into 'master' | Nick Thomas | 2019-05-16 | 3 | -14/+33 |
|\ \ | |||||
| * | | Add :registrations_recaptcha feature flag | Luke Bennett | 2019-05-16 | 3 | -14/+33 |
* | | | Merge branch 'fix_failure_migrate_on_mysql8' into 'master' | Stan Hu | 2019-05-16 | 2 | -1/+7 |
|\ \ \ | |||||
| * | | | Fix. db:migrate is failed on MySQL 8 | sue445 | 2019-05-16 | 2 | -1/+7 |
* | | | | Merge branch '49915-fix-error-500-admin-projects-nil-storage' into 'master' | Stan Hu | 2019-05-16 | 7 | -5/+64 |
|\ \ \ \ | |||||
| * | | | | Fix an error in projects admin when statistics are missing | Rémy Coutable | 2019-05-16 | 7 | -5/+64 |
* | | | | | Merge branch 'docs-render_if_exists-relative-path' into 'master' | Phil Hughes | 2019-05-16 | 1 | -0/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Explain `render_if_exists` relative path | Luke Bennett | 2019-05-16 | 1 | -0/+10 |
* | | | | | | Merge branch 'flash-messages-scb' into 'master' | Phil Hughes | 2019-05-16 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Resolve CE/EE diffs in _flash_messagesflash-messages-scb | Luke Bennett | 2019-05-16 | 1 | -0/+1 |
* | | | | | | Merge branch 'sh-update-rubocop-and-gitlab-styles-ce' into 'master' | Rémy Coutable | 2019-05-16 | 3 | -20/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix Style/NegatedUnless offenses in HAML filesh-update-rubocop-and-gitlab-styles-ce | Rémy Coutable | 2019-05-16 | 1 | -4/+4 |
| * | | | | | | Update Rubocop to 0.69.0 and other gems | Stan Hu | 2019-05-15 | 2 | -16/+16 |
* | | | | | | | Merge branch '59838-blocks' into 'master' | Phil Hughes | 2019-05-16 | 3 | -14/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixes stylelint issues for blocks.scss59838-blocks | Filipa Lacerda | 2019-05-10 | 3 | -14/+8 |
* | | | | | | | | Merge branch '19569-include-information-if-issue-was-closed-via-mr' into 'mas... | Rémy Coutable | 2019-05-16 | 11 | -22/+126 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Include MR information if possible when emailing notification of closing an i... | Michał Zając | 2019-05-16 | 11 | -22/+126 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'ce-11621-fix-broken-master' into 'master' | Rémy Coutable | 2019-05-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix a broken spec for EEce-11621-fix-broken-master | Nick Thomas | 2019-05-16 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'diff-whitespace-setting-changes' into 'master' | Filipa Lacerda | 2019-05-16 | 4 | -6/+50 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Fixes issues with show whitespace button in diffs | Phil Hughes | 2019-05-10 | 4 | -6/+50 |
* | | | | | | | | Merge branch 'acme-module' into 'master' | Nick Thomas | 2019-05-16 | 13 | -4/+337 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add Let's Encrypt client | Vladimir Shushlin | 2019-05-16 | 13 | -4/+337 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'sh-fix-rebase-error-clearing' into 'master' | Nick Thomas | 2019-05-16 | 3 | -2/+33 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Properly clear the merge error upon rebase failuresh-fix-rebase-error-clearing | Stan Hu | 2019-05-15 | 3 | -2/+33 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js-i18n-i' into 'master' | Filipa Lacerda | 2019-05-16 | 5 | -9/+31 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | I18N JS files starting with ijs-i18n-i | Brandon Labuschagne | 2019-05-07 | 5 | -9/+31 |
* | | | | | | | | | Merge branch 'help-scb' into 'master' | Phil Hughes | 2019-05-16 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Resolve CE/EE diffs in help/indexhelp-scb | Luke Bennett | 2019-05-15 | 1 | -2/+1 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'signup-box-scb' into 'master' | Phil Hughes | 2019-05-16 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Resolve CE/EE diffs in signup_boxsignup-box-scb | Luke Bennett | 2019-05-15 | 1 | -0/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'patch-47' into 'master' | Mike Lewis | 2019-05-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | clarify that "team" means "project" when considered for assignment purposes. | Thad Guidry | 2019-04-26 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'docs/single-codebase-info' into 'master' | Mike Lewis | 2019-05-16 | 1 | -0/+56 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add info about the single docs codebase effortdocs/single-codebase-info | Achilleas Pipinellis | 2019-05-08 | 1 | -0/+56 |
* | | | | | | | | | | Merge branch 'winh-fix-jest-fixtures-wrapper' into 'master' | Kushal Pandya | 2019-05-16 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix loadJSONFixtures wrapper in Jestwinh-fix-jest-fixtures-wrapper | Winnie Hellmann | 2019-05-15 | 1 | -3/+6 |
* | | | | | | | | | | | Merge branch 'winh-jestify-security-dashboard-filter-spec' into 'master' | Kushal Pandya | 2019-05-16 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Mock away document.createRange()winh-jestify-security-dashboard-filter-spec | Winnie Hellmann | 2019-05-09 | 1 | -0/+10 |
* | | | | | | | | | | | | Merge branch 'js-i18n-n' into 'master' | Kushal Pandya | 2019-05-16 | 3 | -15/+54 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Add missing sprintf and remove bad i18njs-i18n-n | Brandon Labuschagne | 2019-05-15 | 3 | -32/+12 |
| * | | | | | | | | | | | | Refactor split link after i18n | Brandon Labuschagne | 2019-05-15 | 2 | -15/+16 |
| * | | | | | | | | | | | | I18N JS files starting with n | Brandon Labuschagne | 2019-05-15 | 4 | -22/+80 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'ce-quick-fix-58727-collapsed-sidebar-flyout-menu-items-don-t-ap... | Kushal Pandya | 2019-05-16 | 4 | -3/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix flyout nav on small viewportsce-quick-fix-58727-collapsed-sidebar-flyout-menu-items-don-t-appear-in-1200px-screen-size | Luke Bennett | 2019-05-15 | 4 | -3/+13 |
* | | | | | | | | | | | | | Merge branch 'jej/list-sessions-for-user' into 'master' | Stan Hu | 2019-05-16 | 2 | -11/+84 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Sessions can be listed for a given userjej/list-sessions-for-user | James Edwards-Jones | 2019-05-15 | 2 | -11/+84 |