Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix migration_helpers_spec48967-disable-statement-timeout | Gabriel Mazetto | 2018-07-10 | 1 | -1/+2 |
* | Changelog | Gabriel Mazetto | 2018-07-10 | 1 | -0/+5 |
* | Fix specs to use `disable_statement_timeout` correctly | Gabriel Mazetto | 2018-07-10 | 22 | -226/+234 |
* | MigrationHelper `disable_statement_timeout` accepts `transaction: false` | Gabriel Mazetto | 2018-07-10 | 2 | -44/+168 |
* | Merge branch 'winh-fix-frontend-link-docs' into 'master'rails5-master | Annabel Gray | 2018-07-09 | 1 | -3/+3 |
|\ | |||||
| * | Fix link to frontend in handbook | Winnie Hellmann | 2018-07-09 | 1 | -3/+3 |
|/ | |||||
* | Merge branch 'sh-shorten-filenames-changelog' into 'master' | Felipe Artur | 2018-07-09 | 1 | -0/+0 |
|\ | |||||
| * | Shorten CHANGELOG filename to avoid breaking ecryptfs users | Stan Hu | 2018-07-09 | 1 | -0/+0 |
* | | Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-sub... | Felipe Artur | 2018-07-09 | 0 | -0/+0 |
|/ | |||||
* | Merge branch 'minor-update-ssh-key-docs' into 'master' | Achilleas Pipinellis (🌴 July 10 - July 20 🌴) | 2018-07-09 | 1 | -0/+2 |
|\ | |||||
| * | Add additional headline for Adding SSH keys to GitLab | Andreas Kämmerle | 2018-07-09 | 1 | -0/+2 |
* | | Merge branch 'winh-waiting-in-tests-docs' into 'master' | Tim Zallmann | 2018-07-09 | 1 | -0/+4 |
|\ \ | |/ |/| | |||||
| * | Document that we don't want to wait in testswinh-waiting-in-tests | Winnie Hellmann | 2018-07-09 | 1 | -0/+4 |
* | | Merge branch 'od/41671' into 'master' | Mike Greiling | 2018-07-09 | 3 | -1/+30 |
|\ \ | |||||
| * | | save current date before Pikaday init | Orlando Del Aguila | 2018-06-29 | 3 | -1/+30 |
* | | | Merge branch 'update-rubocop' | Sean McGivern | 2018-07-09 | 220 | -493/+459 |
|\ \ \ | |||||
| * | | | Remove useless return | Lin Jen-Shin | 2018-07-09 | 1 | -1/+1 |
| * | | | Use latest gitlab-styles | Lin Jen-Shin | 2018-07-09 | 3 | -10/+4 |
| * | | | Resolve Naming/UncommunicativeMethod | Lin Jen-Shin | 2018-07-09 | 26 | -156/+156 |
| * | | | Use stable gitlab-styles and eliminate offenses | Lin Jen-Shin | 2018-07-09 | 14 | -35/+29 |
| * | | | Updates from `rubocop -a` | Lin Jen-Shin | 2018-07-09 | 188 | -309/+279 |
| * | | | Update rubocop to get rid of a warning in other MR | Lin Jen-Shin | 2018-07-09 | 5 | -24/+32 |
* | | | | Merge branch 'dz-remote-badges-from-readme' into 'master' | Rémy Coutable | 2018-07-09 | 1 | -6/+0 |
|\ \ \ \ | |||||
| * | | | | Remove badges from README.md in favor of GitLab badges feature | Dmitriy Zaporozhets | 2018-07-06 | 1 | -6/+0 |
* | | | | | Merge branch 'master' into 'master' | Rémy Coutable | 2018-07-09 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Request to be a proofreader. | Yi-Jyun Pan | 2018-07-09 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge branch 'rails5-mysql-fix-pr-importer-spec' into 'master' | Rémy Coutable | 2018-07-09 | 2 | -3/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Rails5 mysql fix milliseconds problem in pull request importer spec | Jasper Maes | 2018-07-08 | 2 | -3/+8 |
* | | | | | | Merge branch 'gitaly-update-branch' into 'master' | Robert Speicher | 2018-07-09 | 3 | -1/+64 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use Gitaly's OperationService.UserUpdateBranch RPC | Alejandro RodrÃguez | 2018-07-08 | 3 | -1/+64 |
* | | | | | | | Merge branch 'use-correct-script-location' into 'master' | Rémy Coutable | 2018-07-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use the correct script location for the build trigger script | DJ Mountney | 2018-07-06 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'upgrade-hamlit-for-ruby25' into 'master' | Rémy Coutable | 2018-07-09 | 5 | -12/+17 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045 | Matthew Dawson | 2018-07-08 | 5 | -12/+17 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'fix-search-bar' into 'master' | Mike Greiling | 2018-07-09 | 2 | -1/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix search bar text input alignment | Clement Ho | 2018-07-09 | 2 | -1/+9 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'rails5-fix-48977' into 'master' | Rémy Coutable | 2018-07-09 | 3 | -3/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Rails5 fix mysql milliseconds problem in specs | Jasper Maes | 2018-07-07 | 3 | -3/+18 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'rails5-update-gemfile-lock' into 'master' | Rémy Coutable | 2018-07-09 | 2 | -5/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update Gemfile.rails5.lock with latest Gemfile.lock changes | Jasper Maes | 2018-07-07 | 2 | -5/+10 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch '48970-markdown-wiki-help-incorrect-in-how-wiki-pages-are-render... | Sean McGivern | 2018-07-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | specify that wiki pags are rendered with Redcarpet | Brett Walker | 2018-07-06 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'docs-clarify-pages-domain' into 'master' | Achilleas Pipinellis (🌴 July 10 - July 20 🌴) | 2018-07-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Docs: make it clear that you need a completely separate domain for Pages | Marcia Ramos | 2018-07-09 | 1 | -2/+2 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jprovazn-upload-symlink' into 'master' | Kamil Trzciński | 2018-07-09 | 4 | -3/+36 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Added test and used Array() instead of .wrap | Jan Provaznik | 2018-07-09 | 2 | -1/+28 |
| * | | | | | | | | Add FileUploader.root to allowed upload paths | Jan Provaznik | 2018-07-08 | 3 | -3/+9 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'DustinU/fix/sign-in-button-text-48917' into 'master' | Douwe Maan | 2018-07-09 | 2 | -1/+27 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Show "Sign in" instead of "Sign in / Register" when sign up is disabled | Dustin Utecht | 2018-07-09 | 2 | -1/+27 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'sh-fix-issue-47797-ce' into 'master' | Douwe Maan | 2018-07-09 | 3 | -0/+36 |
|\ \ \ \ \ \ \ \ |