Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove unnecessary bind callremove-unnecessary-bind-in-gettext | Mark Florian | 2019-05-17 | 1 | -1/+1 |
* | Merge branch 'admin-user-access-levels-scb' into 'master' | Phil Hughes | 2019-05-16 | 1 | -0/+2 |
|\ | |||||
| * | Resolve CE/EE diffs in admin user access levelsadmin-user-access-levels-scb | Luke Bennett | 2019-05-16 | 1 | -0/+2 |
* | | Merge branch 'mirror-repos-scb' into 'master' | Phil Hughes | 2019-05-16 | 1 | -1/+1 |
|\ \ | |||||
| * | | Resolve CE/EE diffs in mirror repos settingsmirror-repos-scb | Luke Bennett | 2019-05-16 | 1 | -1/+1 |
* | | | Merge branch 'jc-omit-count-diverging-commits-max' into 'master' | Lin Jen-Shin | 2019-05-16 | 1 | -1/+22 |
|\ \ \ | |||||
| * | | | Omit max-count for diverging_commit_counts behind feature flagjc-omit-count-diverging-commits-max | John Cai | 2019-05-14 | 1 | -1/+22 |
* | | | | Merge branch 'diff-filter-bar-placeholder-text' into 'master' | Filipa Lacerda | 2019-05-16 | 1 | -1/+8 |
|\ \ \ \ | |||||
| * | | | | Changed the placeholder text of the diff tree filter input | Phil Hughes | 2019-05-16 | 1 | -1/+8 |
* | | | | | Merge branch 'reg-captcha-flag' into 'master' | Nick Thomas | 2019-05-16 | 1 | -9/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Add :registrations_recaptcha feature flag | Luke Bennett | 2019-05-16 | 1 | -9/+16 |
* | | | | | | Merge branch '49915-fix-error-500-admin-projects-nil-storage' into 'master' | Stan Hu | 2019-05-16 | 3 | -5/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix an error in projects admin when statistics are missing | Rémy Coutable | 2019-05-16 | 3 | -5/+7 |
* | | | | | | | 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 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Fix Style/NegatedUnless offenses in HAML filesh-update-rubocop-and-gitlab-styles-ce | Rémy Coutable | 2019-05-16 | 1 | -4/+4 |
* | | | | | | | 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 |
* | | | | | | | | Include MR information if possible when emailing notification of closing an i... | Michał Zając | 2019-05-16 | 8 | -17/+43 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge branch 'diff-whitespace-setting-changes' into 'master' | Filipa Lacerda | 2019-05-16 | 2 | -5/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixes issues with show whitespace button in diffs | Phil Hughes | 2019-05-10 | 2 | -5/+16 |
* | | | | | | | | Add Let's Encrypt client | Vladimir Shushlin | 2019-05-16 | 2 | -3/+9 |
* | | | | | | | | Merge branch 'sh-fix-rebase-error-clearing' into 'master' | Nick Thomas | 2019-05-16 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Properly clear the merge error upon rebase failuresh-fix-rebase-error-clearing | Stan Hu | 2019-05-15 | 1 | -2/+2 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'js-i18n-i' into 'master' | Filipa Lacerda | 2019-05-16 | 4 | -9/+16 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | I18N JS files starting with ijs-i18n-i | Brandon Labuschagne | 2019-05-07 | 4 | -9/+16 |
* | | | | | | | | 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 'js-i18n-n' into 'master' | Kushal Pandya | 2019-05-16 | 2 | -15/+30 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add missing sprintf and remove bad i18njs-i18n-n | Brandon Labuschagne | 2019-05-15 | 2 | -11/+12 |
| * | | | | | | | Refactor split link after i18n | Brandon Labuschagne | 2019-05-15 | 1 | -6/+13 |
| * | | | | | | | I18N JS files starting with n | Brandon Labuschagne | 2019-05-15 | 3 | -22/+29 |
* | | | | | | | | Merge branch 'ce-quick-fix-58727-collapsed-sidebar-flyout-menu-items-don-t-ap... | Kushal Pandya | 2019-05-16 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 | 2 | -1/+5 |
* | | | | | | | | | Merge branch 'jej/list-sessions-for-user' into 'master' | Stan Hu | 2019-05-16 | 1 | -11/+38 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Sessions can be listed for a given userjej/list-sessions-for-user | James Edwards-Jones | 2019-05-15 | 1 | -11/+38 |
* | | | | | | | | | Merge branch 'js-i18n-m' into 'master'60916-list-vanilla-js-i18n-offences-which-were-not-auto-fixed | Kushal Pandya | 2019-05-15 | 5 | -13/+18 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | I18N JS files starting with mjs-i18n-m | Brandon Labuschagne | 2019-05-03 | 5 | -13/+18 |
* | | | | | | | | | | Merge branch 'ce-jej/sso-enforcement-redirect' into 'master' | Rémy Coutable | 2019-05-15 | 6 | -21/+24 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Avoid passing not_found_or_authorized_proc around | James Edwards-Jones | 2019-05-15 | 6 | -21/+18 |
| * | | | | | | | | | | Refactor RoutableActions to allow for additional checks | James Edwards-Jones | 2019-05-15 | 1 | -3/+9 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'new-proj-member-scb' into 'master' | Phil Hughes | 2019-05-15 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Resolve CE/EE diffs in new proj member importnew-proj-member-scb | Luke Bennett | 2019-05-10 | 2 | -1/+6 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'proj-branches-index-scb' into 'master' | Phil Hughes | 2019-05-15 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Resolve CE/EE diffs in project branchesproj-branches-index-scb | Luke Bennett | 2019-05-11 | 1 | -0/+3 |
* | | | | | | | | | | | Merge branch 'layouts-scb' into 'master' | Phil Hughes | 2019-05-15 | 15 | -4/+40 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Resolve CE/EE diffs in app/views/layouts viewlayouts-scb | Luke Bennett | 2019-05-11 | 15 | -4/+40 |
| |/ / / / / / / / / / |