summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into backport-3772-t...backport-3772-total-weightSimon Knox2018-07-10580-3929/+7435
|\
| * Merge branch 'winh-fix-frontend-link-docs' into 'master'rails5-masterAnnabel Gray2018-07-091-3/+3
| |\
| | * Fix link to frontend in handbookWinnie Hellmann2018-07-091-3/+3
| |/
| * Merge branch 'sh-shorten-filenames-changelog' into 'master'Felipe Artur2018-07-091-0/+0
| |\
| | * Shorten CHANGELOG filename to avoid breaking ecryptfs usersStan Hu2018-07-091-0/+0
| * | Replace 48976-rails5-invalid-single-table-inheritance-type-group-is-not-a-sub...Felipe Artur2018-07-090-0/+0
| |/
| * Merge branch 'minor-update-ssh-key-docs' into 'master'Achilleas Pipinellis (🌴 July 10 - July 20 🌴)2018-07-091-0/+2
| |\
| | * Add additional headline for Adding SSH keys to GitLabAndreas Kämmerle2018-07-091-0/+2
| * | Merge branch 'winh-waiting-in-tests-docs' into 'master'Tim Zallmann2018-07-091-0/+4
| |\ \ | | |/ | |/|
| | * Document that we don't want to wait in testswinh-waiting-in-testsWinnie Hellmann2018-07-091-0/+4
| * | Merge branch 'od/41671' into 'master'Mike Greiling2018-07-093-1/+30
| |\ \
| | * | save current date before Pikaday initOrlando Del Aguila2018-06-293-1/+30
| * | | Merge branch 'update-rubocop'Sean McGivern2018-07-09220-493/+459
| |\ \ \
| | * | | Remove useless returnLin Jen-Shin2018-07-091-1/+1
| | * | | Use latest gitlab-stylesLin Jen-Shin2018-07-093-10/+4
| | * | | Resolve Naming/UncommunicativeMethodLin Jen-Shin2018-07-0926-156/+156
| | * | | Use stable gitlab-styles and eliminate offensesLin Jen-Shin2018-07-0914-35/+29
| | * | | Updates from `rubocop -a`Lin Jen-Shin2018-07-09188-309/+279
| | * | | Update rubocop to get rid of a warning in other MRLin Jen-Shin2018-07-095-24/+32
| * | | | Merge branch 'dz-remote-badges-from-readme' into 'master'Rémy Coutable2018-07-091-6/+0
| |\ \ \ \
| | * | | | Remove badges from README.md in favor of GitLab badges featureDmitriy Zaporozhets2018-07-061-6/+0
| * | | | | Merge branch 'master' into 'master'Rémy Coutable2018-07-091-0/+1
| |\ \ \ \ \
| | * | | | | Request to be a proofreader.Yi-Jyun Pan2018-07-091-0/+1
| |/ / / / /
| * | | | | Merge branch 'rails5-mysql-fix-pr-importer-spec' into 'master'Rémy Coutable2018-07-092-3/+8
| |\ \ \ \ \
| | * | | | | Rails5 mysql fix milliseconds problem in pull request importer specJasper Maes2018-07-082-3/+8
| * | | | | | Merge branch 'gitaly-update-branch' into 'master'Robert Speicher2018-07-093-1/+64
| |\ \ \ \ \ \
| | * | | | | | Use Gitaly's OperationService.UserUpdateBranch RPCAlejandro Rodríguez2018-07-083-1/+64
| * | | | | | | Merge branch 'use-correct-script-location' into 'master'Rémy Coutable2018-07-091-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Use the correct script location for the build trigger scriptDJ Mountney2018-07-061-1/+1
| * | | | | | | | Merge branch 'upgrade-hamlit-for-ruby25' into 'master'Rémy Coutable2018-07-095-12/+17
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update hamlit to fix ruby 2.5 incompatibilities, fixes #42045Matthew Dawson2018-07-085-12/+17
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'fix-search-bar' into 'master'Mike Greiling2018-07-092-1/+9
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix search bar text input alignmentClement Ho2018-07-092-1/+9
| |/ / / / / / / /
| * | | | | | | | Merge branch 'rails5-fix-48977' into 'master'Rémy Coutable2018-07-093-3/+18
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Rails5 fix mysql milliseconds problem in specsJasper Maes2018-07-073-3/+18
| | |/ / / / / / /
| * | | | | | | | Merge branch 'rails5-update-gemfile-lock' into 'master'Rémy Coutable2018-07-092-5/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update Gemfile.rails5.lock with latest Gemfile.lock changesJasper Maes2018-07-072-5/+10
| | |/ / / / / / /
| * | | | | | | | Merge branch '48970-markdown-wiki-help-incorrect-in-how-wiki-pages-are-render...Sean McGivern2018-07-091-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | specify that wiki pags are rendered with RedcarpetBrett Walker2018-07-061-2/+2
| * | | | | | | | | Merge branch 'docs-clarify-pages-domain' into 'master'Achilleas Pipinellis (🌴 July 10 - July 20 🌴)2018-07-091-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Docs: make it clear that you need a completely separate domain for PagesMarcia Ramos2018-07-091-2/+2
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'jprovazn-upload-symlink' into 'master'Kamil Trzciński2018-07-094-3/+36
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Added test and used Array() instead of .wrapJan Provaznik2018-07-092-1/+28
| | * | | | | | | | Add FileUploader.root to allowed upload pathsJan Provaznik2018-07-083-3/+9
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'DustinU/fix/sign-in-button-text-48917' into 'master'Douwe Maan2018-07-092-1/+27
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Show "Sign in" instead of "Sign in / Register" when sign up is disabledDustin Utecht2018-07-092-1/+27
| |/ / / / / / / /
| * | | | | | | | Merge branch 'sh-fix-issue-47797-ce' into 'master'Douwe Maan2018-07-093-0/+36
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix handling of annotated tags when Gitaly is not in useStan Hu2018-07-093-0/+36
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch '48960-namespace-diff-module' into 'master'Tim Zallmann2018-07-0912-13/+18
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Call correct action in specFilipa Lacerda2018-07-091-1/+1