Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '55230-remove-project-cleanup-feature-flag' into 'master' | Douwe Maan | 2018-12-17 | 3 | -66/+62 |
|\ | |||||
| * | Remove the project_cleanup feature flag | Nick Thomas | 2018-12-15 | 2 | -48/+14 |
| * | Fix repository cleanup with object storage on | Nick Thomas | 2018-12-15 | 1 | -18/+48 |
* | | Merge branch 'inline-duplicated-discussions' into 'master' | Fatih Acet | 2018-12-17 | 1 | -0/+65 |
|\ \ | |||||
| * | | Fixed duplicated inline diff discussions | Phil Hughes | 2018-12-14 | 1 | -0/+65 |
* | | | Merge branch 'deprecated-comparing-actioncontroller-params-hash' into 'master' | Rémy Coutable | 2018-12-17 | 5 | -10/+10 |
|\ \ \ | |||||
| * | | | Fix deprecation: Comparing equality between ActionController::Parameters and ... | Jasper Maes | 2018-12-16 | 5 | -10/+10 |
* | | | | Merge branch 'deprecated-actiondispatch-paramsparser' into 'master' | Rémy Coutable | 2018-12-17 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | Remove deprecated ActionDispatch::ParamsParser | Jasper Maes | 2018-12-16 | 1 | -1/+0 |
| |/ / / | |||||
* | | | | Merge branch '55433-un-revert-https-gitlab-com-gitlab-org-gitlab-ce-commit-00... | Yorick Peterse | 2018-12-17 | 2 | -20/+155 |
|\ \ \ \ | |||||
| * | | | | Revert "Revert "LfsToken uses JSONWebToken::HMACToken by default"" | Ash McKenzie | 2018-12-17 | 2 | -20/+155 |
| |/ / / | |||||
* | | | | Merge branch 'remove-rails4-specific-code' into 'master' | Rémy Coutable | 2018-12-17 | 11 | -82/+20 |
|\ \ \ \ | |||||
| * | | | | Remove rails4 specific code | Jasper Maes | 2018-12-16 | 11 | -82/+20 |
| |/ / / | |||||
* | | | | Merge branch '34758-list-ancestor-clusters' into 'master' | Dmitriy Zaporozhets | 2018-12-17 | 2 | -1/+202 |
|\ \ \ \ | |||||
| * | | | | Check can :read_clusters in finder | Thong Kuah | 2018-12-17 | 1 | -0/+16 |
| * | | | | Move code to presenter | Thong Kuah | 2018-12-17 | 2 | -73/+125 |
| * | | | | Refactor methods on ClusterHelper | Mayra Cabrera | 2018-12-17 | 1 | -41/+38 |
| * | | | | Move group path display logic to helper | Thong Kuah | 2018-12-17 | 1 | -0/+75 |
| * | | | | Show clusters of ancestors in cluster list page | Thong Kuah | 2018-12-17 | 1 | -0/+61 |
| |/ / / | |||||
* | | | | Merge branch '55276-encoding-issue-with-the-user-centric-tooltips' into 'master' | Tim Zallmann | 2018-12-17 | 1 | -0/+13 |
|\ \ \ \ | |||||
| * | | | | Add a test for special characters | Natalia Tepluhina | 2018-12-14 | 1 | -0/+13 |
* | | | | | Merge branch 'deprecated-positional-seperator-parameter' into 'master' | Rémy Coutable | 2018-12-17 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Passing the separator argument as a positional parameter is deprecated | Jasper Maes | 2018-12-14 | 1 | -1/+1 |
* | | | | | | Merge branch 'rubocop-prepend' into 'master' | Rémy Coutable | 2018-12-17 | 1 | -0/+133 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added Cop for injecting EE modules | Yorick Peterse | 2018-12-13 | 1 | -0/+133 |
* | | | | | | | Merge branch 'fix-rspec-offcense' into 'master' | Rémy Coutable | 2018-12-17 | 4 | -8/+8 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Fix RSpec/HookArgument rubocop offense | Semyon Pupkov | 2018-12-11 | 4 | -8/+8 |
* | | | | | | | 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 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Fix broken karma test | Martin Wortschack | 2018-12-15 | 1 | -3/+4 |
* | | | | | | | Merge branch '54786-mr-empty-file-display' into 'master' | Nick Thomas | 2018-12-15 | 3 | -1/+129 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix diff table rendering for empty files and improve tests | Sean Nichols | 2018-12-13 | 1 | -5/+13 |
| * | | | | | | 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 | 3 | -1/+121 |
* | | | | | | | Merge branch 'rs-transient-help-page-failure' into 'master' | Stan Hu | 2018-12-15 | 2 | -15/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 | 2 | -8/+9 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch '47052-merge-button-does-not-appear-after-rebase-ing' into 'master' | Mike Greiling | 2018-12-14 | 3 | -11/+18 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Set cached MRWidget SHA after rebase | Sam Bigelow | 2018-12-14 | 3 | -11/+18 |
* | | | | | | | Merge branch 'remove-rails4-support' into 'master' | Stan Hu | 2018-12-14 | 4 | -20/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove rails 4 support in CI, Gemfiles, bin/ and config/ | Jasper Maes | 2018-12-14 | 4 | -20/+4 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Resolve a transient failure in MWPS feature spec | Robert Speicher | 2018-12-14 | 1 | -0/+2 |
|/ / / / / / | |||||
* | | | | | | 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 '53771-move-cluster-type-description' into 'master' | Kamil Trzciński | 2018-12-14 | 1 | -0/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move description of cluster type to presenter | Thong Kuah | 2018-12-13 | 1 | -0/+14 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'remove-issue-suggestions-flag' into 'master' | Douwe Maan | 2018-12-14 | 1 | -0/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Pass on arguments passed to the FeatureConstrainer | Bob Van Landuyt | 2018-12-14 | 1 | -0/+11 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ac-releases-name-sha-author' into 'master' | Kamil Trzciński | 2018-12-14 | 7 | -0/+35 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add name, author and sha to releases | Alessio Caiazza | 2018-12-13 | 7 | -0/+35 |
| |/ / / / / / |