Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ce-6117-unify-preview-mailer' into 'master' | Sean McGivern | 2018-07-10 | 1 | -0/+11 |
|\ | |||||
| * | This test was copied from EE | Lin Jen-Shin | 2018-07-10 | 1 | -0/+11 |
* | | Merge branch 'rails5-mysql-rename-column' into 'master' | Yorick Peterse | 2018-07-10 | 2 | -0/+10 |
|\ \ | |||||
| * | | Rails5 MySQL fix rename_column as part of cleanup_concurrent_column_type_change | Jasper Maes | 2018-07-09 | 2 | -0/+10 |
| |/ | |||||
* | | Merge branch 'rd-ee-backport-add-support-for-gl-com-trials' into 'master' | Sean McGivern | 2018-07-10 | 1 | -6/+6 |
|\ \ | |||||
| * | | Backport some changes made for this spec in EE | Rubén Dávila | 2018-07-02 | 1 | -6/+6 |
* | | | Merge branch 'docs-bitbucket-typo' into 'master' | Rémy Coutable | 2018-07-10 | 1 | -9/+9 |
|\ \ \ | |||||
| * | | | Update bitbucket.md to fix typo and small grammar touchups. | Marcel Amirault | 2018-07-10 | 1 | -9/+9 |
|/ / / | |||||
* | | | Merge branch 'syntax-test-branch' into 'master' | Rémy Coutable | 2018-07-10 | 2 | -6/+12 |
|\ \ \ | |||||
| * | | | Update time_helper.rb to fix output for exact minutes. | Marcel Amirault | 2018-07-10 | 2 | -6/+12 |
|/ / / | |||||
* | | | Merge branch 'rjh/doc-update-for-gitlab-pages' into 'master' | Rémy Coutable | 2018-07-10 | 2 | -5/+31 |
|\ \ \ | |||||
| * | | | Document update for GitLab Pages users. | Richard Hancock | 2018-07-10 | 2 | -5/+31 |
|/ / / | |||||
* | | | Merge branch 'fix-api-docs-simple-projects' into 'master' | Rémy Coutable | 2018-07-10 | 1 | -4/+39 |
|\ \ \ | |||||
| * | | | Fix API docs on unauthenticated projects return | Kaspar Emanuel | 2018-07-09 | 1 | -4/+39 |
* | | | | Merge branch 'gitaly-mandatory-20180709-jv' into 'master' | Douwe Maan | 2018-07-10 | 5 | -186/+73 |
|\ \ \ \ | |||||
| * | | | | Use Gitaly for fetches and creating bundles | Jacob Vosmaer | 2018-07-09 | 5 | -186/+73 |
* | | | | | Merge branch 'improve-metadata-access-performance' into 'master' | Grzegorz Bizon | 2018-07-10 | 15 | -317/+431 |
|\ \ \ \ \ | |||||
| * | | | | | Fix specs | Kamil Trzciński | 2018-07-09 | 3 | -13/+13 |
| * | | | | | Fix and add specs for testing metadata entry | Kamil Trzciński | 2018-07-09 | 8 | -97/+172 |
| * | | | | | Access metadata directly from Object Storage | Kamil Trzciński | 2018-07-09 | 12 | -219/+258 |
* | | | | | | Merge branch '48537-update-avatar-only-via-api' into 'master' | Rémy Coutable | 2018-07-10 | 3 | -1/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix #48537 - Update avatar only via the projects API | Jamie Schembri | 2018-07-09 | 3 | -1/+21 |
* | | | | | | | Merge branch '42415-omit-projects-from-get-group-endpoint' into 'master' | Douwe Maan | 2018-07-10 | 4 | -5/+55 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Adds with_projects optional parameter to /groups/:id API endpoint | Tiago Botelho | 2018-07-09 | 4 | -5/+55 |
* | | | | | | | | Merge branch 'winh-mounthelper-path-docs' into 'master' | Filipa Lacerda | 2018-07-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix mountComponent helper path in docs | Winnie Hellmann | 2018-07-09 | 1 | -1/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'winh-stop-all-environments' into 'master' | Phil Hughes | 2018-07-10 | 32 | -737/+994 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Support manually stopping any environment from the UI | Winnie Hellmann | 2018-07-10 | 32 | -737/+994 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch '48951-clean-up' into 'master' | Phil Hughes | 2018-07-10 | 5 | -66/+56 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Removes unused store in diffs mr refactor | Filipa Lacerda | 2018-07-09 | 5 | -66/+56 |
* | | | | | | | | | 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 |