summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Send extra Gitaly params for `send_git_archive` if neededAlejandro Rodríguez2017-10-022-1/+46
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '38635-fix-gitlab-check-git-ssh-config' into 'master'Douwe Maan2017-10-033-1/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitelist authorized_keys.lock in the gitlab:check rake task Closes #38635 See merge request gitlab-org/gitlab-ce!14624
| * | | | | | | | | | | Whitelist authorized_keys.lock in the gitlab:check rake taskNick Thomas2017-10-023-1/+12
| | | | | | | | | | | |
* | | | | | | | | | | | Merge remote-tracking branch 'dev/master'Stan Hu2017-10-022-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update CHANGELOG.md for 9.5.6Jose Ivan Vargas2017-09-292-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | Merge branch 'enhance-logging' into 'master'Robert Speicher2017-10-025-3/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved file logging for authentication events See merge request gitlab-org/gitlab-ce!9196
| * | | | | | | | | | | Remove lock reason and add guard clauseBrian Neel2017-09-292-2/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Standardize capitalization and statusBrian Neel2017-09-272-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Merge conflict resolutionBrian Neel2017-09-271-6/+6
| | | | | | | | | | | |
| * | | | | | | | | | | # This is a combination of 1 commit.Brian Neel2017-09-275-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # This is the 1st commit message: Add logging for all web authentication events # This is the commit message #2: Re-add underscore to after_inactive_sign_up_path_for # This is the commit message #3: Standardize on username= # This is the commit message #4: after_filter -> after_action, _resource -> resource # This is the commit message #5: Add two-factor login failures and account lockouts # This is the commit message #6: Move logging from two-factor concern to user model # This is the commit message #7: Add spaces around default parameter assignments # This is the commit message #8: Move logs out of user model # This is the commit message #9: Replace filtered_params with user_params # This is the commit message #10: Standardize case # This is the commit message #1: Fixes for username and AppLogger.info
* | | | | | | | | | | | Merge branch 'sh-fix-import-repos' into 'master'Robert Speicher2017-10-025-3/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitlab-rake gitlab:import:repos task Closes #37682 See merge request gitlab-org/gitlab-ce!14597
| * | | | | | | | | | | | Fix gitlab-rake gitlab:import:repos taskStan Hu2017-10-025-3/+31
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of a change in GitLab 9.5.4 to prevent users from assuming control of a repository already on disk, the import task broke. Imports would fail with the message, "There is already a repository with that name on disk". This change skips the validation when the import is done from the command-line. Closes #37682
* | | | | | | | | | | | Merge branch 'rd/fix-case-sensative-email-conf-signup' into 'master'Robert Speicher2017-10-023-1/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix case sensitive email confirmation on signup See merge request gitlab-org/gitlab-ce!14606
| * | | | | | | | | | | Add new changelog entryrobdel122017-09-301-0/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Add `:email_confirmation` to devise `insensitive_keys`robdel122017-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where the email confirmation input value is case sensative. For example, if the email input is `myemail@example.com` and the email confirmation input is `Myemail@example.com` the form would fail to submit.
| * | | | | | | | | | | Create failing test caserobdel122017-09-301-0/+18
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix/gpg/case-insensitive' into 'master'Dmitriy Zaporozhets2017-10-023-1/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make GPG validation case insensitive See merge request gitlab-org/gitlab-ce!14376
| * | | | | | | | | | | Make GPG validation case insensitive.Tim Bishop2017-09-293-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In line with other changes in GitLab, make email address validation properly case insensitive. The email address in the commit may be in any case, so it needs downcasing to match the address stored in GitLab for the user. Without this change the comparison fails and commits are not marked as verified. See #37009.
* | | | | | | | | | | | Merge branch 'log-update-ref-errors' into 'master'Sean McGivern2017-10-021-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log update-ref errors in OperationService See merge request gitlab-org/gitlab-ce!14627
| * | | | | | | | | | | | Log update-ref errors in OperationServiceJacob Vosmaer2017-10-021-1/+3
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'sh-thread-safe-markdown' into 'master'Robert Speicher2017-10-022-18/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Redcarpet Markdown renderer thread-safe Closes #36637 See merge request gitlab-org/gitlab-ce!14604
| * | | | | | | | | | | Make Redcarpet Markdown renderer thread-safeStan Hu2017-10-022-18/+19
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Redcarpet library is not thread-safe as described in https://github.com/vmg/redcarpet/issues/570. Since we instantiate the Redcarpet renderer in a class variable, multiple Sidekiq threads can access the work buffer and corrupt the state. We work around this issue by memoizing the renderer on a thread basis. Closes #36637
* | | | | | | | | | | Merge branch '33493-attempt-to-link-saml-users-to-ldap-by-email' into 'master'Douwe Maan2017-10-029-111/+173
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to link saml users to ldap by email Closes #33493 See merge request gitlab-org/gitlab-ce!14216
| * | | | | | | | | | | 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" See merge request gitlab-org/gitlab-ce!14628
| * | | | | | | | | | | | Revert "Increase diff limits to 100 KB for collapse and 200 KB overall"Sean McGivern2017-10-023-73/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1d3c33b57eeb39df76e78fd37c86532c02aa22ac.
* | | | | | | | | | | | | Merge branch '38641-repo-editor-callout' into 'master'Jacob Schatz2017-10-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes auto devops callout from repo editor view See merge request gitlab-org/gitlab-ce!14616
| * | | | | | | | | | | | 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.0 See merge request gitlab-org/gitlab-ce!14625
| * | | | | | | | | | | | | 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 typo in comment deletion confirmation dialog Closes #38619 See merge request gitlab-org/gitlab-ce!14622
| * | | | | | | | | | | | | 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 spec See merge request gitlab-org/gitlab-ce!14619
| * | | | | | | | | | | | | 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 'a while' => 'in a while' See merge request gitlab-org/gitlab-ce!14433
| * | | | | | | | | | | | | 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 backup/restore Closes #38352 See merge request gitlab-org/gitlab-ce!14595
| * | | | | | | | | | | | | Ensure all refs are restored on a restore from backupsh-restore-all-refs-backupStan Hu2017-09-292-1/+6
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To restore all refs from a bundle, we need to use the --mirror option to ensure that all refs are properly restored. Without this, refs such as `refs/merge-requests/X` and `refs/keep-around/Y` would be omitted, which exposed a bug as described in https://gitlab.com/gitlab-org/gitlab-ce/issues/38319#note_41648608. Closes #38352
* | | | | | | | | | | | | Merge branch 'Update-description-accept-mr' into 'master'Sean McGivern2017-10-021-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CONTRIBUTING.md See merge request gitlab-org/gitlab-ce!14591
| * | | | | | | | | | | | 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 job See merge request gitlab-org/gitlab-ce!14618
| * | | | | | | | | | | | | 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 RPC Closes gitaly#544 See merge request gitlab-org/gitlab-ce!14522
| * | | | | | | | | | | | | 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 components See merge request gitlab-org/gitlab-ce!14579
| * | | | | | | | | | | | Remove global componentsFilipa Lacerda2017-10-027-35/+55
|/ / / / / / / / / / / /
View Lorry Controller Status