summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Migrate Git::Blob.batch to Gitalyfeature/migrate-blob-batch-to-gitalyAhmad Sherif2018-02-058-51/+164
| | | | Closes gitaly#985
* Merge branch 'fix/gitaly-wiki-encoding-issues' into 'master'Robert Speicher2018-02-052-1/+17
|\ | | | | | | | | Encode GitalyClient::WikiPage attributes to UTF-8 See merge request gitlab-org/gitlab-ce!16925
| * Encode GitalyClient::WikiPage attributes to UTF-8fix/gitaly-wiki-encoding-issuesAhmad Sherif2018-02-053-2/+18
| |
* | Merge branch '42547-upload-store-mount-point' into 'master'Sean McGivern2018-02-0515-30/+120
|\ \ | | | | | | | | | | | | | | | | | | Store uploader context in uploads Closes #42547 See merge request gitlab-org/gitlab-ce!16779
| * | apply fixes from feedback42547-upload-store-mount-pointMicaël Bergeron2018-02-023-9/+37
| | |
| * | fix the schema.rbMicaël Bergeron2018-02-021-0/+2
| | |
| * | fix specsMicaël Bergeron2018-02-022-1/+6
| | |
| * | add the uploader context to the upload modelMicaël Bergeron2018-02-0212-30/+85
| | |
* | | Merge branch 'axios-preview-markdown' into 'master'Fatih Acet2018-02-051-15/+15
|\ \ \ | | | | | | | | | | | | | | | | Replace $.ajax in preview markdown with axios See merge request gitlab-org/gitlab-ce!16893
| * | | Replace $.ajax in preview markdown with axiosClement Ho2018-02-051-15/+15
| | | |
* | | | Merge branch 'axios-admin-message' into 'master'Fatih Acet2018-02-053-8/+15
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Replace $.ajax in admin broadcast messages with axios See merge request gitlab-org/gitlab-ce!16840
| * | | Replace $.ajax in admin broadcast messages with axiosClement Ho2018-02-053-8/+15
|/ / /
* | | Merge branch 'axios-username-validator' into 'master'Fatih Acet2018-02-051-6/+6
|\ \ \ | | | | | | | | | | | | | | | | Replace $.ajax in username validator with axios See merge request gitlab-org/gitlab-ce!16892
| * | | Replace $.ajax in username validator with axiosaxios-username-validatorClement Ho2018-02-021-6/+6
| | | |
* | | | Merge branch 'persistent-callouts' into 'master'Kamil Trzciński2018-02-0512-0/+203
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add backend for persistently dismissible callouts See merge request gitlab-org/gitlab-ce!16735
| * | | | Add CHANGELOGMatija Čupić2018-02-051-0/+5
| | | | |
| * | | | Refactor UserCalloutsController enum checkMatija Čupić2018-02-051-7/+3
| | | | |
| * | | | Refactor .show_gke_cluster_integration_callout?Matija Čupić2018-02-052-20/+12
| | | | |
| * | | | Bump UserCallout feature_name enum indexMatija Čupić2018-02-051-1/+1
| | | | |
| * | | | Merge branch 'master' into persistent-calloutspersistent-calloutsMatija Čupić2018-02-0322-350/+664
| |\ \ \ \
| * | | | | Change UserCallout feautre_name to enumMatija Čupić2018-02-038-22/+42
| | | | | |
| * | | | | Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-02619-5021/+8644
| |\ \ \ \ \
| * | | | | | Rename Callout to UserCalloutMatija Čupić2018-02-0211-27/+25
| | | | | | |
| * | | | | | Remove timestamps from CalloutsMatija Čupić2018-02-021-2/+0
| | | | | | |
| * | | | | | Refactor CalloutsControllerMatija Čupić2018-02-023-8/+10
| | | | | | |
| * | | | | | Use policies instead of role checks in ClustersHelperMatija Čupić2018-02-022-18/+9
| | | | | | |
| * | | | | | Remove dismissed_state from Callout modelMatija Čupić2018-02-028-25/+20
| | | | | | |
| * | | | | | Add callout priority enumMatija Čupić2018-02-011-0/+5
| | | | | | |
| * | | | | | Fix CalloutsHelper spec subjectMatija Čupić2018-01-301-1/+1
| | | | | | |
| * | | | | | Extract feature name into constantMatija Čupić2018-01-301-2/+4
| | | | | | |
| * | | | | | Show GKE cluster callout for project owner as wellMatija Čupić2018-01-302-4/+16
| | | | | | |
| * | | | | | Add safe navigation for users without callout stateMatija Čupić2018-01-301-1/+1
| | | | | | |
| * | | | | | Add check for guest userMatija Čupić2018-01-302-1/+9
| | | | | | |
| * | | | | | Move Callouts route to - pathMatija Čupić2018-01-271-5/+5
| | | | | | |
| * | | | | | Implement CalloutsHelperMatija Čupić2018-01-272-0/+56
| | | | | | |
| * | | | | | Merge branch 'master' into persistent-calloutsMatija Čupić2018-01-2726-173/+295
| |\ \ \ \ \ \
| * | | | | | | Update database schemaMatija Čupić2018-01-261-1/+13
| | | | | | | |
| * | | | | | | Add CalloutsController specsMatija Čupić2018-01-261-0/+39
| | | | | | | |
| * | | | | | | Implement Callouts controllerMatija Čupić2018-01-262-0/+32
| | | | | | | |
| * | | | | | | Add Callout specsMatija Čupić2018-01-262-0/+17
| | | | | | | |
| * | | | | | | Add Callout modelMatija Čupić2018-01-263-0/+23
| | | | | | | |
* | | | | | | | Merge branch '39985-enable-prometheus-metrics-for-deployed-ingresses' into ↵Kamil Trzciński2018-02-055-5/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Enable Prometheus metrics for deployed Ingresses Closes #39985 See merge request gitlab-org/gitlab-ce!16866
| * | | | | | | | Enable Prometheus metrics for deployed IngressesJoshua Lambert2018-02-055-5/+26
| | | | | | | | |
* | | | | | | | | Merge branch ↵Kamil Trzciński2018-02-051-77/+97
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2-1' into 'master' Adapt config to support Prometheus 2.1 Closes #42496 and #42498 See merge request gitlab-org/gitlab-ce!16749
| * | | | | | | | Adapt config to support Prometheus 2.1Joshua Lambert2018-02-051-77/+97
|/ / / / / / / /
* | | | | | | | Merge branch '42270-fix-namespace-remove-exports-for-hashed-storage' into ↵Rémy Coutable2018-02-059-46/+120
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix export removal for hashed-storage projects within a renamed or deleted namespace Closes #42270 See merge request gitlab-org/gitlab-ce!16658
| * | | | | | | | Fix export removal for hashed-storage projects within a renamed or deleted ↵Nick Thomas2018-02-059-46/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | namespace
* | | | | | | | | Merge branch 'api-guard' into 'master'Rémy Coutable2018-02-051-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make find_user_from_sources extensible for EE See merge request gitlab-org/gitlab-ce!16924
| * | | | | | | | | Make find_user_from_sources extensible for EELin Jen-Shin2018-02-051-1/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch 'osw-markdown-bypass-for-commit-messages' into 'master'Sean McGivern2018-02-053-27/+37
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bypass markdown for commit titles on MR notes Closes #37616 See merge request gitlab-org/gitlab-ce!16883
View Lorry Controller Status