summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update time_helper.rb to fix output for exact minutes.Marcel Amirault2018-07-102-6/+12
* Merge branch 'rjh/doc-update-for-gitlab-pages' into 'master'Rémy Coutable2018-07-102-5/+31
|\
| * Document update for GitLab Pages users.Richard Hancock2018-07-102-5/+31
|/
* Merge branch 'fix-api-docs-simple-projects' into 'master'Rémy Coutable2018-07-101-4/+39
|\
| * Fix API docs on unauthenticated projects returnKaspar Emanuel2018-07-091-4/+39
* | Merge branch 'gitaly-mandatory-20180709-jv' into 'master'Douwe Maan2018-07-105-186/+73
|\ \
| * | Use Gitaly for fetches and creating bundlesJacob Vosmaer2018-07-095-186/+73
* | | Merge branch 'improve-metadata-access-performance' into 'master'Grzegorz Bizon2018-07-1015-317/+431
|\ \ \
| * | | Fix specsKamil Trzciński2018-07-093-13/+13
| * | | Fix and add specs for testing metadata entryKamil Trzciński2018-07-098-97/+172
| * | | Access metadata directly from Object StorageKamil Trzciński2018-07-0912-219/+258
* | | | Merge branch '48537-update-avatar-only-via-api' into 'master'Rémy Coutable2018-07-103-1/+21
|\ \ \ \
| * | | | Fix #48537 - Update avatar only via the projects APIJamie Schembri2018-07-093-1/+21
* | | | | Merge branch '42415-omit-projects-from-get-group-endpoint' into 'master'Douwe Maan2018-07-104-5/+55
|\ \ \ \ \
| * | | | | Adds with_projects optional parameter to /groups/:id API endpointTiago Botelho2018-07-094-5/+55
* | | | | | Merge branch 'winh-mounthelper-path-docs' into 'master'Filipa Lacerda2018-07-101-1/+1
|\ \ \ \ \ \
| * | | | | | Fix mountComponent helper path in docsWinnie Hellmann2018-07-091-1/+1
* | | | | | | Merge branch 'winh-stop-all-environments' into 'master'Phil Hughes2018-07-1032-737/+994
|\ \ \ \ \ \ \
| * | | | | | | Support manually stopping any environment from the UIWinnie Hellmann2018-07-1032-737/+994
|/ / / / / / /
* | | | | | | Merge branch '48951-clean-up' into 'master'Phil Hughes2018-07-105-66/+56
|\ \ \ \ \ \ \
| * | | | | | | Removes unused store in diffs mr refactorFilipa Lacerda2018-07-095-66/+56
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \