Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve CE/EE diffs in admin user access levelsadmin-user-access-levels-scb | Luke Bennett | 2019-05-16 | 1 | -0/+2 |
* | 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 |
* | | | | | | | | | | | Merge branch 'winh-karma-chrome-keychain' into 'master' | Stan Hu | 2019-05-15 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Suppress keychain access popup from chromedriver in Karma | Winnie Hellmann | 2019-05-15 | 1 | -0/+2 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'patch-55' into 'master' | Clement Ho | 2019-05-15 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Couple of improvements to the Vuex frontend guide | Phillip Johnsen | 2019-05-10 | 1 | -2/+2 |
* | | | | | | | | | | | | Merge branch 'patch-37' into 'master' | Evan Read | 2019-05-15 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Update mysql.md: variables values should be quoted, otherwise you get an "var... | Jean | 2019-05-15 | 1 | -2/+2 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'master' into 'master' | Evan Read | 2019-05-15 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | [CI doc] Add chat value to only keyword | BAI Peng | 2019-05-15 | 1 | -0/+1 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'patch-34' into 'master' | Evan Read | 2019-05-15 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | recursive/nested includes supported now | Ben Bodenmiller | 2019-05-06 | 1 | -3/+0 |
* | | | | | | | | | | | | | Merge branch 'patch-54' into 'master' | Evan Read | 2019-05-15 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | upgrate example ymal file, change type to stage. | mouson | 2019-05-02 | 1 | -2/+7 |
* | | | | | | | | | | | | | | Merge branch 'docs-component-cleanup' into 'master' | Achilleas Pipinellis | 2019-05-15 | 1 | -41/+43 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | docs: improve architecture component details | Ben Bodenmiller | 2019-05-15 | 1 | -41/+43 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'docs-update-group-template-pricing-tier' into 'master' | Evan Read | 2019-05-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Update group project templates to premium/silverdocs-update-group-template-pricing-tier | Tristan Williams | 2019-05-14 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Merge branch 'docs-correct-security-anchor-ee' into 'master' | Achilleas Pipinellis | 2019-05-15 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Update links to new security docsdocs-correct-security-anchor-ee | Mark Chao | 2019-05-13 | 2 | -3/+3 |
* | | | | | | | | | | | | | | | | Merge branch 'patch-57' into 'master' | Achilleas Pipinellis | 2019-05-15 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | docs: use sudo on gitlab-rake gitlab:features:* | Ben Bodenmiller | 2019-05-15 | 1 | -3/+2 |
|/ / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge branch 'patch-58' into 'master' | Evan Read | 2019-05-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |