summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* UX review18608-lock-issues-v2Luke "Jared" Bennett2017-10-065-2/+11
* Fix wording in the js messagesJarka Kadlecova2017-10-063-3/+3
* Refactor discussion lock docsAchilleas Pipinellis2017-10-052-10/+21
* Add documentation for discussion lockJarka Kadlecova2017-10-046-0/+30
* Merge branch '18608-lock-issues-v2' of gitlab.com:gitlab-org/gitlab-ce into 1...Luke "Jared" Bennett2017-10-03621-7109/+11882
|\
| * fix db schemaJarka Kadlecova2017-10-031-16/+16
| * Remove redundant column from the schemaJarka Kadlecova2017-10-031-1/+0
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issu...Jarka Kadlecova2017-10-03621-7092/+11866
| |\
| | * 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 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
| | * | | Merge branch 'enhance-logging' into 'master'Robert Speicher2017-10-025-3/+28
| | |\ \ \
| | | * | | 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
| | * | | | Merge branch 'sh-fix-import-repos' into 'master'Robert Speicher2017-10-025-3/+31
| | |\ \ \ \
| | | * | | | Fix gitlab-rake gitlab:import:repos taskStan Hu2017-10-025-3/+31
| | * | | | | Merge branch 'rd/fix-case-sensative-email-conf-signup' into 'master'Robert Speicher2017-10-023-1/+24
| | |\ \ \ \ \
| | | * | | | | Add new changelog entryrobdel122017-09-301-0/+5
| | | * | | | | Add `:email_confirmation` to devise `insensitive_keys`robdel122017-09-301-1/+1
| | | * | | | | 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.Tim Bishop2017-09-293-1/+14
| | * | | | | | | Merge branch 'log-update-ref-errors' into 'master'Sean McGivern2017-10-021-1/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | 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-safeStan Hu2017-10-022-18/+19
| | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status