Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '55402-broken-master-karma-test-failing-in-spec-javascripts-boar...53225-rendering-and-usability-problems-with-ie-1153104-redesign-group-overview-ui-mvc | Stan Hu | 2018-12-16 | 2 | -3/+9 |
|\ | |||||
| * | Fix broken karma test | Martin Wortschack | 2018-12-15 | 2 | -3/+9 |
* | | Merge branch '54786-mr-empty-file-display' into 'master' | Nick Thomas | 2018-12-15 | 9 | -3/+150 |
|\ \ | |/ |/| | |||||
| * | Fix diff table rendering for empty files and improve tests | Sean Nichols | 2018-12-13 | 2 | -7/+15 |
| * | Fix redundant returns in spec file | Sean Nichols | 2018-12-13 | 1 | -3/+3 |
| * | Add tests and move empty file message into own component | Sean Nichols | 2018-12-13 | 5 | -3/+128 |
| * | Move empty file message to diff_content component | Sean Nichols | 2018-12-12 | 2 | -2/+2 |
| * | Update localization files | Sean Nichols | 2018-12-12 | 1 | -0/+3 |
| * | Fix Prettier formatting and add MR to changelog | Sean Nichols | 2018-12-11 | 2 | -4/+2 |
| * | Display empty files properly on MR diffs | Sean Nichols | 2018-12-11 | 4 | -0/+13 |
* | | Merge branch 'rs-transient-help-page-failure' into 'master' | Stan Hu | 2018-12-15 | 4 | -20/+20 |
|\ \ | |||||
| * | | Resolve transient failure in Help page spec | Robert Speicher | 2018-12-14 | 1 | -7/+6 |
| * | | Use class methods for VersionCheck | Robert Speicher | 2018-12-14 | 4 | -13/+14 |
* | | | Merge branch '47052-merge-button-does-not-appear-after-rebase-ing' into 'master' | Mike Greiling | 2018-12-14 | 8 | -17/+37 |
|\ \ \ | |||||
| * | | | Set cached MRWidget SHA after rebase | Sam Bigelow | 2018-12-14 | 8 | -17/+37 |
* | | | | Merge branch 'patch-31' into 'master' | Achilleas Pipinellis | 2018-12-14 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fixed link in doc/ci/yaml/README.md | Philipp Hasper | 2018-11-29 | 1 | -1/+1 |
* | | | | | Merge branch 'docs/ci-yaml-only-except-complex' into 'master' | Achilleas Pipinellis | 2018-12-14 | 1 | -44/+54 |
|\ \ \ \ \ | |||||
| * | | | | | Refactor the only and except complex section | Achilleas Pipinellis | 2018-12-13 | 1 | -44/+54 |
* | | | | | | Merge branch 'docs-le-for-pages' into 'master' | Achilleas Pipinellis | 2018-12-14 | 3 | -15/+172 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Docs: Let's Encrypt certificate for GitLab Pages | Marcia Ramos | 2018-12-14 | 3 | -15/+172 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'docs-remove-rails5' into 'master' | Stan Hu | 2018-12-14 | 2 | -28/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Removed rails 5 documentation | Jan Provaznik | 2018-12-14 | 2 | -28/+0 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'remove-rails4-support' into 'master' | Stan Hu | 2018-12-14 | 33 | -1684/+129 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove rails 4 support in CI, Gemfiles, bin/ and config/ | Jasper Maes | 2018-12-14 | 33 | -1684/+129 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rs-transient-failure' into 'master' | Stan Hu | 2018-12-14 | 1 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Resolve a transient failure in MWPS feature spec | Robert Speicher | 2018-12-14 | 1 | -0/+2 |
* | | | | | | Merge branch 'rs-remove-create-user-variable' into 'master'43516-rake-task-to-test-ssl-connection-certificate-verification | Stan Hu | 2018-12-14 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove CREATE_DB_USER variable in prepare_build | Robert Speicher | 2018-12-13 | 1 | -1/+0 |
* | | | | | | | Merge branch 'doc-prettier-vscode-settings' into 'master' | Filipa Lacerda | 2018-12-14 | 1 | -0/+35 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Update prettier.md with VSCode Settings section | Paul Slaughter | 2018-12-14 | 1 | -0/+35 |
* | | | | | | | Merge branch 'fix-warnings' into 'master' | Robert Speicher | 2018-12-14 | 4 | -22/+48 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix warning: already initialized constant STATUSES | Semyon Pupkov | 2018-12-13 | 2 | -15/+37 |
| * | | | | | | | Fix warning already initialized constant LABEL_TITLES | Semyon Pupkov | 2018-12-13 | 2 | -7/+11 |
* | | | | | | | | Merge branch 'refactor-ci-pipeline-config-source-enum' into 'master' | Kamil Trzciński | 2018-12-14 | 2 | -5/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Refactor Ci::Pipeline's config_sources enum | Yorick Peterse | 2018-12-13 | 2 | -5/+11 |
* | | | | | | | | | Merge branch '53771-move-cluster-type-description' into 'master' | Kamil Trzciński | 2018-12-14 | 3 | -1/+23 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Move description of cluster type to presenter | Thong Kuah | 2018-12-13 | 3 | -1/+23 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'remove-issue-suggestions-flag' into 'master' | Douwe Maan | 2018-12-14 | 8 | -10/+24 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Pass on arguments passed to the FeatureConstrainer | Bob Van Landuyt | 2018-12-14 | 3 | -5/+16 |
| * | | | | | | | | | Enable GraphQL API endpoint | Phil Hughes | 2018-12-13 | 5 | -7/+11 |
| * | | | | | | | | | Remove issue_suggestions feature flag | Phil Hughes | 2018-12-13 | 4 | -5/+4 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'patch-13' into 'master' | Achilleas Pipinellis | 2018-12-14 | 1 | -8/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | ci/yaml: remove "recursion" mention if merging is not recursive | Elan Ruusamäe | 2018-12-10 | 1 | -8/+8 |
* | | | | | | | | | | Merge branch '43959-serverless-tab-docs' into 'master' | Achilleas Pipinellis | 2018-12-14 | 6 | -68/+163 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Serverless Doc Updates | Daniel Gruesso | 2018-12-14 | 6 | -68/+163 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'docs-add-proofreader-dplanella' into 'master' | Achilleas Pipinellis | 2018-12-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add dplanella as Catalan proofreader | David Planella | 2018-12-14 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'patch-35' into 'master' | Achilleas Pipinellis | 2018-12-14 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix missing empty space that makes rendered gitlab documentation page missing... | Enrique Alvarez | 2018-12-12 | 1 | -0/+1 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | |