summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'bootstrap4'Clement Ho2018-05-0167-514/+1658
|\
| * Merge branch 'dm-commit-trailer-without-gravatar' into 'master'Robert Speicher2018-05-0110-227/+250
| |\
| | * Make avatar helpers available to emailsDouwe Maan2018-04-261-0/+1
| | * Fix commit trailer rendering when Gravatar is disabledDouwe Maan2018-04-259-227/+249
| * | Merge branch 'gitlab-workhorse-4.2.0' into 'master'Douwe Maan2018-05-011-1/+1
| |\ \
| | * | Use gitlab-workhorse 4.2.0Jacob Vosmaer2018-05-011-1/+1
| * | | Merge branch 'osw-use-cached-highlighted-content-for-discussions' into 'master'Douwe Maan2018-05-014-6/+49
| |\ \ \
| | * | | Use persisted diff data instead fetching Git on discussionsOswaldo Ferreira2018-04-304-6/+49
| * | | | Merge branch 'helm-add-alpine-mirrors' into 'master'Kamil Trzciński2018-05-016-72/+59
| |\ \ \ \
| | * | | | Add alpine mirrors while operating on k8s clusterAlessio Caiazza2018-04-306-72/+59
| * | | | | Merge branch 'jprovazn-commit-notes-api' into 'master'Douwe Maan2018-05-0117-67/+955
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge request and commit discussions APIJan Provaznik2018-05-0117-67/+955
| |/ / / /
| * | | | Merge branch 'zj-fix-index-rails' into 'master'Douwe Maan2018-05-011-1/+3
| |\ \ \ \
| | * | | | Use Ruby methods, not Rails' String#firstZeger-Jan van de Weg2018-05-011-1/+3
| | |/ / /
| * | | | Merge branch 'jej/exclude-group-saml-buttons' into 'master'Douwe Maan2018-05-013-4/+32
| |\ \ \ \
| | * | | | Exclude LDAP from OmniauthCallbackController base methodsJames Edwards-Jones2018-04-303-4/+32
| * | | | | Merge branch 'feature/filter-groups-for-admin-in-dashboard' into 'master'Douwe Maan2018-05-017-44/+98
| |\ \ \ \ \
| | * | | | | show only groups an admin is a member of in dashboards/gropsRoger Rüttimann2018-05-017-44/+98
| |/ / / / /
| * | | | | Merge branch 'update-timeline-icon-for-description-edit' into 'master'Phil Hughes2018-05-012-3/+8
| |\ \ \ \ \
| | * | | | | Update timeline icon for description editGeorge Tsiolis2018-05-012-3/+8
| * | | | | | Merge branch 'blackst0ne-fix-user-toggles-subscription-spec' into 'master'Stan Hu2018-05-011-4/+4
| |\ \ \ \ \ \
| | * | | | | | Fix spec/features/projects/issues/user_toggles_subscription_spec.rbblackst0ne2018-05-011-4/+4
| |/ / / / / /
| * | | | | | Merge remote-tracking branch 'dev/master'Stan Hu2018-04-301-0/+22
| |\ \ \ \ \ \
| | * | | | | | Merge branch '10-7-security_issue_42029' into 'security-10-7'Phil Hughes2018-04-304-2/+17
| | * | | | | | Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7'Douwe Maan2018-04-305-72/+144
| | * | | | | | Merge remote-tracking branch 'dev/master'James Lopez2018-04-301-0/+22
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Update CHANGELOG.md for 10.7.2Mayra Cabrera2018-04-251-0/+8
| | | * | | | | Update CHANGELOG.md for 10.6.5Mayra Cabrera2018-04-241-0/+7
| | | * | | | | Update CHANGELOG.md for 10.5.8Mayra Cabrera2018-04-241-0/+7
| * | | | | | | Merge branch 'revert-discussion-counter-height' into 'master'Filipa Lacerda2018-04-303-5/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Revert discussion counter heightGeorge Tsiolis2018-05-013-5/+6
| * | | | | | | | Merge branch 'fix-inconsistent-protected-branch-pill-baseline' into 'master'Filipa Lacerda2018-04-302-6/+10
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Fixed inconsistent protected branch pill baselineConstance Okoghenun2018-04-302-6/+10
| |/ / / / / / /
| * | | | | | | Merge branch '10-7-security_issue_42029' into 'security-10-7'Phil Hughes2018-04-304-2/+17
| * | | | | | | Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7'Douwe Maan2018-04-305-72/+144
* | | | | | | | [skip ci] Convert .input-group-btn to input-group-appendClement Ho2018-04-301-1/+1
* | | | | | | | Use hide instead of hiddenClement Ho2018-04-301-2/+2
* | | | | | | | Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-30157-647/+1567
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'bvl-fix-openid-redirect' into 'master'Douwe Maan2018-04-305-1/+23
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Define custom base controller for DoorkeeperBob Van Landuyt2018-04-305-1/+23
| * | | | | | | Merge branch 'rebase-in-progress-fast-timeout' into 'master'Douwe Maan2018-04-301-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Use fast timeouts for Gitaly FooInProgress RPC'sJacob Vosmaer2018-04-301-2/+2
| * | | | | | | | Merge branch '43614-osw-diff-docs' into 'master'Douwe Maan2018-04-302-0/+116
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add developer documentation on diff handling and limitsOswaldo Ferreira2018-04-302-0/+116
| * | | | | | | | | Merge branch 'grpc-1.11.0' into 'master'Stan Hu2018-04-302-3/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Use grpc 1.11.0Jacob Vosmaer2018-04-302-3/+3
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'ce-jej/branch-unprotection-disable-ui' into 'master'Grzegorz Bizon | OOO until May 7th2018-04-303-3/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Backports EE changes from disabling branch unprotect UIJames Edwards-Jones2018-04-253-3/+3
| * | | | | | | | | | Merge branch '45481-sane-pages-artifacts' into 'master'Kamil Trzciński2018-04-303-60/+26
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | InvaildStateError -> InvalidStateErrorNick Thomas2018-04-271-9/+9