summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Send API parameters as extra data for sentry errorsapi-sentry-extraAlejandro Rodríguez2017-10-053-3/+31
* Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'Douwe Maan2017-10-029-111/+173
|\
| * Refactors SAML identity creation in gl_user.Tiago Botelho2017-10-028-161/+122
| * Creates compound query for LDAP email attributes.Tiago Botelho2017-09-252-7/+15
| * Attempt to link saml users to ldap by emailTiago Botelho2017-09-255-8/+101
* | Merge branch 'revert-configurable-size-limits' into 'master'Douwe Maan2017-10-023-73/+14
|\ \
| * | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"Sean McGivern2017-10-023-73/+14
* | | Merge branch '38641-repo-editor-callout' into 'master'Jacob Schatz2017-10-021-1/+1
|\ \ \
| * | | Removes auto devops callout from repo editor viewFilipa Lacerda2017-10-021-1/+1
* | | | Merge branch 'gitaly-0.43.0' into 'master'Sean McGivern2017-10-021-1/+1
|\ \ \ \
| * | | | Use Gitaly 0.43.0Jacob Vosmaer2017-10-021-1/+1
* | | | | Merge branch '38619-fix-comment-delete-confirm-text' into 'master'Filipa Lacerda2017-10-022-1/+6
|\ \ \ \ \
| * | | | | Fix comment deletion confirmation dialog typoMark Fletcher2017-10-022-1/+6
* | | | | | Merge branch 'fix-gitlay-typo' into 'master'Douwe Maan2017-10-021-1/+1
|\ \ \ \ \ \
| * | | | | | Fix 'gitlay' typo in specJacob Vosmaer2017-10-021-1/+1
* | | | | | | Merge branch 'translation-timeago-a-while-ago' into 'master'Douwe Maan2017-10-022-3/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix translation for 'in a while'translation-timeago-a-while-agoKim "BKC" Carlbäcker2017-09-222-3/+3
* | | | | | | Merge branch 'sh-restore-all-refs-backup' into 'master'Sean McGivern2017-10-022-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Ensure all refs are restored on a restore from backupsh-restore-all-refs-backupStan Hu2017-09-292-1/+6
* | | | | | | | Merge branch 'Update-description-accept-mr' into 'master'Sean McGivern2017-10-021-0/+4
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Update CONTRIBUTING.mdUpdate-description-accept-mrVictor Wu2017-09-291-0/+4
* | | | | | | | Merge branch 'docs/add-changelog-lint' into 'master'Sean McGivern2017-10-021-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add changelog lint script to docs lint CI jobAchilleas Pipinellis2017-10-021-0/+1
* | | | | | | | | Merge branch 'gitaly-add-branch' into 'master'Sean McGivern2017-10-0210-62/+231
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Implement OperationService.UserAddBranch Gitaly RPCgitaly-add-branchAlejandro Rodríguez2017-09-304-32/+152
| * | | | | | | | Populate `Gitlay::Repository`'s `gl_repository` fieldAlejandro Rodríguez2017-09-304-3/+48
| * | | | | | | | Add a factory for `Gitaly::GitCommit`sAlejandro Rodríguez2017-09-303-27/+31
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch '34371-ca-vue' into 'master'Phil Hughes2017-10-027-35/+55
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Remove global componentsFilipa Lacerda2017-10-027-35/+55
|/ / / / / / /
* | | | | | | Merge branch '38571-fix-exception-in-raven-report' into 'master'Sean McGivern2017-10-023-3/+32
|\ \ \ \ \ \ \
| * | | | | | | Ensure no exception is raised when Raven tries to get the current user in API...38571-fix-exception-in-raven-reportRémy Coutable2017-09-293-3/+32
* | | | | | | | Merge branch '34366-issue-sidebar-don-t-render-participants-in-collapsed-stat...Tim Zallmann2017-10-029-70/+173
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | use LazyImageTagHelper.placeholder_image for blank src base64 image34366-issue-sidebar-don-t-render-participants-in-collapsed-stateLuke "Jared" Bennett2017-10-011-1/+1
| * | | | | | | Merge remote-tracking branch 'origin/master' into 34366-issue-sidebar-don-t-r...Luke "Jared" Bennett2017-09-28340-2007/+2934
| |\ \ \ \ \ \ \
| * | | | | | | | Added changelogLuke "Jared" Bennett2017-09-281-0/+5
| * | | | | | | | Only trigger loadCheck on open toggle, not close. Update specs and add right_...Luke "Jared" Bennett2017-09-284-65/+104
| * | | | | | | | issuable_context_spec review changesLuke "Jared" Bennett2017-09-281-5/+5
| * | | | | | | | Finish issuable_context_specLuke "Jared" Bennett2017-09-281-10/+7
| * | | | | | | | Add issauble_context_specLuke "Jared" Bennett2017-09-281-0/+31
| * | | | | | | | Finish _participants view specLuke "Jared" Bennett2017-09-281-22/+7
| * | | | | | | | Update projects_helper_specLuke "Jared" Bennett2017-09-281-2/+2
| * | | | | | | | Add participants specLuke "Jared" Bennett2017-09-281-0/+41
| * | | | | | | | Conditionally call loadCheck if lazyLoader is presentLuke "Jared" Bennett2017-09-282-3/+2
| * | | | | | | | Trigger load of lazy images when opening sidebar, or clicking 'more participa...Luke "Jared" Bennett2017-09-282-2/+7
| * | | | | | | | Add lazy_load option to participant avatar helperLuke "Jared" Bennett2017-09-282-3/+6
* | | | | | | | | Merge branch '38052-use-simple-api-for-projects' into 'master'Tim Zallmann2017-10-023-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add changelog entry38052-use-simple-api-for-projectskushalpandya2017-09-291-0/+5
| * | | | | | | | | Use `simple=true` for projects API for better performancekushalpandya2017-09-292-2/+2
* | | | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2017-10-0215-778/+4918
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'master-i18n' into 'master'Douwe Maan2017-10-0115-778/+4918
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |