Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into 'bootstrap4' | Clement Ho | 2018-05-01 | 67 | -514/+1658 |
|\ | |||||
| * | Merge branch 'dm-commit-trailer-without-gravatar' into 'master' | Robert Speicher | 2018-05-01 | 10 | -227/+250 |
| |\ | |||||
| | * | Make avatar helpers available to emails | Douwe Maan | 2018-04-26 | 1 | -0/+1 |
| | * | Fix commit trailer rendering when Gravatar is disabled | Douwe Maan | 2018-04-25 | 9 | -227/+249 |
| * | | Merge branch 'gitlab-workhorse-4.2.0' into 'master' | Douwe Maan | 2018-05-01 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Use gitlab-workhorse 4.2.0 | Jacob Vosmaer | 2018-05-01 | 1 | -1/+1 |
| * | | | Merge branch 'osw-use-cached-highlighted-content-for-discussions' into 'master' | Douwe Maan | 2018-05-01 | 4 | -6/+49 |
| |\ \ \ | |||||
| | * | | | Use persisted diff data instead fetching Git on discussions | Oswaldo Ferreira | 2018-04-30 | 4 | -6/+49 |
| * | | | | Merge branch 'helm-add-alpine-mirrors' into 'master' | Kamil Trzciński | 2018-05-01 | 6 | -72/+59 |
| |\ \ \ \ | |||||
| | * | | | | Add alpine mirrors while operating on k8s cluster | Alessio Caiazza | 2018-04-30 | 6 | -72/+59 |
| * | | | | | Merge branch 'jprovazn-commit-notes-api' into 'master' | Douwe Maan | 2018-05-01 | 17 | -67/+955 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Merge request and commit discussions API | Jan Provaznik | 2018-05-01 | 17 | -67/+955 |
| |/ / / / | |||||
| * | | | | Merge branch 'zj-fix-index-rails' into 'master' | Douwe Maan | 2018-05-01 | 1 | -1/+3 |
| |\ \ \ \ | |||||
| | * | | | | Use Ruby methods, not Rails' String#first | Zeger-Jan van de Weg | 2018-05-01 | 1 | -1/+3 |
| | |/ / / | |||||
| * | | | | Merge branch 'jej/exclude-group-saml-buttons' into 'master' | Douwe Maan | 2018-05-01 | 3 | -4/+32 |
| |\ \ \ \ | |||||
| | * | | | | Exclude LDAP from OmniauthCallbackController base methods | James Edwards-Jones | 2018-04-30 | 3 | -4/+32 |
| * | | | | | Merge branch 'feature/filter-groups-for-admin-in-dashboard' into 'master' | Douwe Maan | 2018-05-01 | 7 | -44/+98 |
| |\ \ \ \ \ | |||||
| | * | | | | | show only groups an admin is a member of in dashboards/grops | Roger Rüttimann | 2018-05-01 | 7 | -44/+98 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'update-timeline-icon-for-description-edit' into 'master' | Phil Hughes | 2018-05-01 | 2 | -3/+8 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update timeline icon for description edit | George Tsiolis | 2018-05-01 | 2 | -3/+8 |
| * | | | | | | Merge branch 'blackst0ne-fix-user-toggles-subscription-spec' into 'master' | Stan Hu | 2018-05-01 | 1 | -4/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix spec/features/projects/issues/user_toggles_subscription_spec.rb | blackst0ne | 2018-05-01 | 1 | -4/+4 |
| |/ / / / / / | |||||
| * | | | | | | Merge remote-tracking branch 'dev/master' | Stan Hu | 2018-04-30 | 1 | -0/+22 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Merge branch '10-7-security_issue_42029' into 'security-10-7' | Phil Hughes | 2018-04-30 | 4 | -2/+17 |
| | * | | | | | | Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7' | Douwe Maan | 2018-04-30 | 5 | -72/+144 |
| | * | | | | | | Merge remote-tracking branch 'dev/master' | James Lopez | 2018-04-30 | 1 | -0/+22 |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | | * | | | | | Update CHANGELOG.md for 10.7.2 | Mayra Cabrera | 2018-04-25 | 1 | -0/+8 |
| | | * | | | | | Update CHANGELOG.md for 10.6.5 | Mayra Cabrera | 2018-04-24 | 1 | -0/+7 |
| | | * | | | | | Update CHANGELOG.md for 10.5.8 | Mayra Cabrera | 2018-04-24 | 1 | -0/+7 |
| * | | | | | | | Merge branch 'revert-discussion-counter-height' into 'master' | Filipa Lacerda | 2018-04-30 | 3 | -5/+6 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Revert discussion counter height | George Tsiolis | 2018-05-01 | 3 | -5/+6 |
| * | | | | | | | | Merge branch 'fix-inconsistent-protected-branch-pill-baseline' into 'master' | Filipa Lacerda | 2018-04-30 | 2 | -6/+10 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | Fixed inconsistent protected branch pill baseline | Constance Okoghenun | 2018-04-30 | 2 | -6/+10 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch '10-7-security_issue_42029' into 'security-10-7' | Phil Hughes | 2018-04-30 | 4 | -2/+17 |
| * | | | | | | | Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7' | Douwe Maan | 2018-04-30 | 5 | -72/+144 |
* | | | | | | | | [skip ci] Convert .input-group-btn to input-group-append | Clement Ho | 2018-04-30 | 1 | -1/+1 |
* | | | | | | | | Use hide instead of hidden | Clement Ho | 2018-04-30 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'master' into 'bootstrap4' | Clement Ho | 2018-04-30 | 157 | -647/+1567 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'bvl-fix-openid-redirect' into 'master' | Douwe Maan | 2018-04-30 | 5 | -1/+23 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Define custom base controller for Doorkeeper | Bob Van Landuyt | 2018-04-30 | 5 | -1/+23 |
| * | | | | | | | Merge branch 'rebase-in-progress-fast-timeout' into 'master' | Douwe Maan | 2018-04-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Use fast timeouts for Gitaly FooInProgress RPC's | Jacob Vosmaer | 2018-04-30 | 1 | -2/+2 |
| * | | | | | | | | Merge branch '43614-osw-diff-docs' into 'master' | Douwe Maan | 2018-04-30 | 2 | -0/+116 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add developer documentation on diff handling and limits | Oswaldo Ferreira | 2018-04-30 | 2 | -0/+116 |
| * | | | | | | | | | Merge branch 'grpc-1.11.0' into 'master' | Stan Hu | 2018-04-30 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Use grpc 1.11.0 | Jacob Vosmaer | 2018-04-30 | 2 | -3/+3 |
| | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'ce-jej/branch-unprotection-disable-ui' into 'master' | Grzegorz Bizon | OOO until May 7th | 2018-04-30 | 3 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Backports EE changes from disabling branch unprotect UI | James Edwards-Jones | 2018-04-25 | 3 | -3/+3 |
| * | | | | | | | | | | Merge branch '45481-sane-pages-artifacts' into 'master' | Kamil Trzciński | 2018-04-30 | 3 | -60/+26 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | InvaildStateError -> InvalidStateError | Nick Thomas | 2018-04-27 | 1 | -9/+9 |