summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Resolve merge conflictswalkafwalka-ingress-hostnamesjerasmus2019-03-071-129/+53
* Add support for ingress hostnameswalkafwalka2019-03-0730-137/+296
* Merge branch 'sh-rugged-get-tree-entry' into 'master'Sean McGivern2019-03-074-1/+132
|\
| * Fix return nil Rubocop offensesStan Hu2019-03-071-3/+3
| * Bring back Rugged implementation of TreeEntryStan Hu2019-03-074-1/+132
* | Merge branch 'jest-docs' into 'master'Mike Lewis2019-03-071-8/+52
|\ \
| * | Apply suggestion to doc/development/testing_guide/frontend_testing.mdLuke Bennett2019-03-071-1/+1
| * | Add jest to frontend_testing docsLuke Bennett2019-03-041-8/+52
* | | Merge branch 'dz-patch-48' into 'master'Lin Jen-Shin2019-03-071-1/+1
|\ \ \
| * | | Update packages comment in gitlab.yml.example [ci skip]Dmitriy Zaporozhets2019-03-071-1/+1
|/ / /
* | | Merge branch 'ce-extract-ee-specific-code-for-spec/support' into 'master'Dmitriy Zaporozhets2019-03-079-87/+138
|\ \ \
| * | | Reduce differences in spec/support/shared_contexts/services_shared_context.rbRémy Coutable2019-03-071-0/+8
| * | | Reduce differences in spec/support/webmock.rbRémy Coutable2019-03-071-1/+9
| * | | Reduce differences in spec/support/matchers/access_matchers.rbRémy Coutable2019-03-071-18/+17
| * | | Reduce differences in spec/support/helpers/kubernetes_helpers.rbRémy Coutable2019-03-071-0/+15
| * | | Reduce differences in spec/support/helpers/javascript_fixtures_helpers.rbRémy Coutable2019-03-072-22/+27
| * | | Reduce differences in spec/support/db_cleaner.rbRémy Coutable2019-03-072-45/+61
| * | | Reduce differences in spec/support/api/schema_matcher.rbRémy Coutable2019-03-071-1/+1
* | | | Merge branch 'sh-rugged-tree-entries' into 'master'Sean McGivern2019-03-076-15/+191
|\ \ \ \
| * | | | Remove unnecessary return statements in tree.rbStan Hu2019-03-071-2/+2
| | |_|/ | |/| |
| * | | Remove old code in TreeHelper#flatten_treeStan Hu2019-03-072-13/+6
| * | | Bring back Rugged implementation of GetTreeEntriesStan Hu2019-03-075-5/+188
* | | | Merge branch 'restrict-jupyter-login' into 'master'Dmitriy Zaporozhets2019-03-074-8/+19
|\ \ \ \
| * | | | Merge branch 'restrict-jupyter-login' of https://gitlab.com/amit1rrr/gitlab-c...Amit Rathi2019-03-074-8/+19
|/ / / /
* | | | Merge branch 'revert-fee665e6' into 'master'Filipa Lacerda2019-03-0716-713/+600
|\ \ \ \
| * | | | Revert "Merge branch 'id-1951-filter-merge-requests-by-approvers' into 'master'"Igor2019-03-0716-713/+600
|/ / / /
* | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Douwe Maan2019-03-0741-5598/+24438
|\ \ \ \
| * | | | Port translations from EEGitLab Crowdin Bot2019-03-0741-5598/+24438
* | | | | Merge branch 'fix-blob-editor-deleting-content' into 'master'Filipa Lacerda2019-03-073-1/+15
|\ \ \ \ \
| * | | | | Fixed the blob editor deleting all content for filesPhil Hughes2019-03-073-1/+15
* | | | | | Merge branch 'eb-update-cycle-analytics-docs' into 'master'Kushal Pandya2019-03-074-25/+20
|\ \ \ \ \ \
| * | | | | | Update Cycle Analytics documentationEric Brinkman2019-03-074-25/+20
* | | | | | | Merge branch 'fix-sidekiq-process-group-killing' into 'master'Stan Hu2019-03-072-3/+6
|\ \ \ \ \ \ \
| * | | | | | | Fix Sidekiq process group killingNick Thomas2019-03-072-3/+6
* | | | | | | | Merge branch '56937-edit-knative-domain' into 'master'Grzegorz Bizon2019-03-0735-300/+958
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't use sleep in feature specsJoão Cunha2019-03-061-25/+8
| * | | | | | | | Remove unecessary begin..end blockJoão Cunha2019-03-062-24/+20
| * | | | | | | | Use tap command for better readabilityJoão Cunha2019-03-061-3/+3
| * | | | | | | | Rename ClusterUpdateAppWorker to ClusterPatchAppWorkerJoão Cunha2019-03-057-13/+13
| * | | | | | | | Fix rubocop offensesJoão Cunha2019-03-051-2/+2
| * | | | | | | | Adds Knative udpate feature specsJoão Cunha2019-03-051-8/+73
| * | | | | | | | Sends update route to the clientJoão Cunha2019-03-056-0/+31
| * | | | | | | | Creates Clusterss::ApplciationsController update endpointJoão Cunha2019-03-0516-104/+569
| * | | | | | | | Add ability to edit Knative domainjerasmus2019-03-0511-168/+286
* | | | | | | | | Merge branch 'patch-47' into 'master'Marcia Ramos2019-03-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix missing quoteMartin Melka2019-03-051-1/+1
* | | | | | | | | | Merge branch 'winh-enable-reply_to_individual_notes' into 'master'Grzegorz Bizon2019-03-077-7/+32
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Add current state of docsWinnie Hellmann2019-03-063-2/+23
| * | | | | | | | | Enable reply_to_individual_notes feature flag by defaultWinnie Hellmann2019-03-064-5/+9
* | | | | | | | | | Merge branch '47869-jobs-tab-border-top-in-pipeline-s-page-is-1px-off' into '...Annabel Dunstone Gray2019-03-073-5/+11
|\ \ \ \ \ \ \ \ \ \