Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Send API parameters as extra data for sentry errorsapi-sentry-extra | Alejandro Rodríguez | 2017-10-05 | 3 | -3/+31 |
* | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master' | Douwe Maan | 2017-10-02 | 9 | -111/+173 |
|\ | |||||
| * | Refactors SAML identity creation in gl_user. | Tiago Botelho | 2017-10-02 | 8 | -161/+122 |
| * | Creates compound query for LDAP email attributes. | Tiago Botelho | 2017-09-25 | 2 | -7/+15 |
| * | Attempt to link saml users to ldap by email | Tiago Botelho | 2017-09-25 | 5 | -8/+101 |
* | | Merge branch 'revert-configurable-size-limits' into 'master' | Douwe Maan | 2017-10-02 | 3 | -73/+14 |
|\ \ | |||||
| * | | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall" | Sean McGivern | 2017-10-02 | 3 | -73/+14 |
* | | | Merge branch '38641-repo-editor-callout' into 'master' | Jacob Schatz | 2017-10-02 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Removes auto devops callout from repo editor view | Filipa Lacerda | 2017-10-02 | 1 | -1/+1 |
* | | | | Merge branch 'gitaly-0.43.0' into 'master' | Sean McGivern | 2017-10-02 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Use Gitaly 0.43.0 | Jacob Vosmaer | 2017-10-02 | 1 | -1/+1 |
* | | | | | Merge branch '38619-fix-comment-delete-confirm-text' into 'master' | Filipa Lacerda | 2017-10-02 | 2 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fix comment deletion confirmation dialog typo | Mark Fletcher | 2017-10-02 | 2 | -1/+6 |
* | | | | | | Merge branch 'fix-gitlay-typo' into 'master' | Douwe Maan | 2017-10-02 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix 'gitlay' typo in spec | Jacob Vosmaer | 2017-10-02 | 1 | -1/+1 |
* | | | | | | | Merge branch 'translation-timeago-a-while-ago' into 'master' | Douwe Maan | 2017-10-02 | 2 | -3/+3 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Fix translation for 'in a while'translation-timeago-a-while-ago | Kim "BKC" Carlbäcker | 2017-09-22 | 2 | -3/+3 |
* | | | | | | | Merge branch 'sh-restore-all-refs-backup' into 'master' | Sean McGivern | 2017-10-02 | 2 | -1/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Ensure all refs are restored on a restore from backupsh-restore-all-refs-backup | Stan Hu | 2017-09-29 | 2 | -1/+6 |
* | | | | | | | | Merge branch 'Update-description-accept-mr' into 'master' | Sean McGivern | 2017-10-02 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Update CONTRIBUTING.mdUpdate-description-accept-mr | Victor Wu | 2017-09-29 | 1 | -0/+4 |
* | | | | | | | | Merge branch 'docs/add-changelog-lint' into 'master' | Sean McGivern | 2017-10-02 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add changelog lint script to docs lint CI job | Achilleas Pipinellis | 2017-10-02 | 1 | -0/+1 |
* | | | | | | | | | Merge branch 'gitaly-add-branch' into 'master' | Sean McGivern | 2017-10-02 | 10 | -62/+231 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Implement OperationService.UserAddBranch Gitaly RPCgitaly-add-branch | Alejandro Rodríguez | 2017-09-30 | 4 | -32/+152 |
| * | | | | | | | | Populate `Gitlay::Repository`'s `gl_repository` field | Alejandro Rodríguez | 2017-09-30 | 4 | -3/+48 |
| * | | | | | | | | Add a factory for `Gitaly::GitCommit`s | Alejandro Rodríguez | 2017-09-30 | 3 | -27/+31 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '34371-ca-vue' into 'master' | Phil Hughes | 2017-10-02 | 7 | -35/+55 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Remove global components | Filipa Lacerda | 2017-10-02 | 7 | -35/+55 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '38571-fix-exception-in-raven-report' into 'master' | Sean McGivern | 2017-10-02 | 3 | -3/+32 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Ensure no exception is raised when Raven tries to get the current user in API...38571-fix-exception-in-raven-report | Rémy Coutable | 2017-09-29 | 3 | -3/+32 |
* | | | | | | | | Merge branch '34366-issue-sidebar-don-t-render-participants-in-collapsed-stat... | Tim Zallmann | 2017-10-02 | 9 | -70/+173 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | use LazyImageTagHelper.placeholder_image for blank src base64 image34366-issue-sidebar-don-t-render-participants-in-collapsed-state | Luke "Jared" Bennett | 2017-10-01 | 1 | -1/+1 |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into 34366-issue-sidebar-don-t-r... | Luke "Jared" Bennett | 2017-09-28 | 340 | -2007/+2934 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Added changelog | Luke "Jared" Bennett | 2017-09-28 | 1 | -0/+5 |
| * | | | | | | | | Only trigger loadCheck on open toggle, not close. Update specs and add right_... | Luke "Jared" Bennett | 2017-09-28 | 4 | -65/+104 |
| * | | | | | | | | issuable_context_spec review changes | Luke "Jared" Bennett | 2017-09-28 | 1 | -5/+5 |
| * | | | | | | | | Finish issuable_context_spec | Luke "Jared" Bennett | 2017-09-28 | 1 | -10/+7 |
| * | | | | | | | | Add issauble_context_spec | Luke "Jared" Bennett | 2017-09-28 | 1 | -0/+31 |
| * | | | | | | | | Finish _participants view spec | Luke "Jared" Bennett | 2017-09-28 | 1 | -22/+7 |
| * | | | | | | | | Update projects_helper_spec | Luke "Jared" Bennett | 2017-09-28 | 1 | -2/+2 |
| * | | | | | | | | Add participants spec | Luke "Jared" Bennett | 2017-09-28 | 1 | -0/+41 |
| * | | | | | | | | Conditionally call loadCheck if lazyLoader is present | Luke "Jared" Bennett | 2017-09-28 | 2 | -3/+2 |
| * | | | | | | | | Trigger load of lazy images when opening sidebar, or clicking 'more participa... | Luke "Jared" Bennett | 2017-09-28 | 2 | -2/+7 |
| * | | | | | | | | Add lazy_load option to participant avatar helper | Luke "Jared" Bennett | 2017-09-28 | 2 | -3/+6 |
* | | | | | | | | | Merge branch '38052-use-simple-api-for-projects' into 'master' | Tim Zallmann | 2017-10-02 | 3 | -2/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add changelog entry38052-use-simple-api-for-projects | kushalpandya | 2017-09-29 | 1 | -0/+5 |
| * | | | | | | | | | Use `simple=true` for projects API for better performance | kushalpandya | 2017-09-29 | 2 | -2/+2 |
* | | | | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master' | Douwe Maan | 2017-10-02 | 15 | -778/+4918 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Merge branch 'master-i18n' into 'master' | Douwe Maan | 2017-10-01 | 15 | -778/+4918 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | |