summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use gitaly 0.96.2Jacob Vosmaer2018-05-011-1/+1
* 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
* | | | | 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
| * | | | | | | | | Don't automatically remove artifacts for pages jobs after pages:deploy has runNick Thomas2018-04-273-51/+17
* | | | | | | | | | Merge branch 'pages-0-9-1' into 'master'Kamil Trzciński2018-04-301-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use GitLab Pages v0.9.1Nick Thomas2018-04-301-1/+1
* | | | | | | | | | | Merge branch 'fix-namespaceless-project-destroy-worker-specs' into 'master'Douwe Maan2018-04-301-9/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Makes namespaceless project destroy worker spec not depend on a specific migr...Tiago Botelho2018-04-301-9/+6
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'docs-review-home' into 'master'Achilleas Pipinellis2018-04-301-14/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Docs: review product categories in doc/READMEMarcia Ramos2018-04-301-14/+25
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'zj-remove-repo-path-remote-repository' into 'master'Douwe Maan2018-04-302-2/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove legacy storage path callZeger-Jan van de Weg2018-04-302-2/+7
* | | | | | | | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-04-301-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update index.mdShinya Maeda2018-04-301-0/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master'Douwe Maan2018-04-308-8/+158
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adds spec for omni_auth jwt strategyTiago Botelho2018-04-261-0/+87
| * | | | | | | | | | Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suiteTiago Botelho2018-04-267-8/+71