Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use gitaly 0.96.2 | Jacob Vosmaer | 2018-05-01 | 1 | -1/+1 |
* | 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 |
* | | | | | 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 |
| * | | | | | | | | | Don't automatically remove artifacts for pages jobs after pages:deploy has run | Nick Thomas | 2018-04-27 | 3 | -51/+17 |
* | | | | | | | | | | Merge branch 'pages-0-9-1' into 'master' | Kamil Trzciński | 2018-04-30 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Use GitLab Pages v0.9.1 | Nick Thomas | 2018-04-30 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'fix-namespaceless-project-destroy-worker-specs' into 'master' | Douwe Maan | 2018-04-30 | 1 | -9/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Makes namespaceless project destroy worker spec not depend on a specific migr... | Tiago Botelho | 2018-04-30 | 1 | -9/+6 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'docs-review-home' into 'master' | Achilleas Pipinellis | 2018-04-30 | 1 | -14/+25 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Docs: review product categories in doc/README | Marcia Ramos | 2018-04-30 | 1 | -14/+25 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'zj-remove-repo-path-remote-repository' into 'master' | Douwe Maan | 2018-04-30 | 2 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove legacy storage path call | Zeger-Jan van de Weg | 2018-04-30 | 2 | -2/+7 |
* | | | | | | | | | | Merge branch 'patch-28' into 'master' | Achilleas Pipinellis | 2018-04-30 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update index.md | Shinya Maeda | 2018-04-30 | 1 | -0/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'add-jwt-strategy-to-gitlab-suite' into 'master' | Douwe Maan | 2018-04-30 | 8 | -8/+158 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Adds spec for omni_auth jwt strategy | Tiago Botelho | 2018-04-26 | 1 | -0/+87 |
| * | | | | | | | | | | Ports omniauth-jwt gem onto GitLab OmniAuth Strategies suite | Tiago Botelho | 2018-04-26 | 7 | -8/+71 |