summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Set todos#author_id to NOT NULL.32282-add-foreign-keys-to-todosAndreas Brandl2018-02-055-3/+31
* Add foreign keys to todos table.Andreas Brandl2018-02-058-4/+115
* Merge branch 'axios-preview-markdown' into 'master'Fatih Acet2018-02-051-15/+15
|\
| * 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 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 axiosaxios-username-validatorClement Ho2018-02-021-6/+6
* | Merge branch 'persistent-callouts' into 'master'Kamil Trzciński2018-02-0512-0/+203
|\ \
| * | 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 'm...Kamil Trzciński2018-02-055-5/+26
|\ \ \ \ \ \
| * | | | | | Enable Prometheus metrics for deployed IngressesJoshua Lambert2018-02-055-5/+26
* | | | | | | Merge branch '42496-prometheus-deployment-fails-after-helm-chart-upgrade-to-2...Kamil Trzciński2018-02-051-77/+97
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Adapt config to support Prometheus 2.1Joshua Lambert2018-02-051-77/+97
|/ / / / / /
* | | | | | Merge branch '42270-fix-namespace-remove-exports-for-hashed-storage' into 'ma...Rémy Coutable2018-02-059-46/+120
|\ \ \ \ \ \
| * | | | | | Fix export removal for hashed-storage projects within a renamed or deleted na...Nick Thomas2018-02-059-46/+120
* | | | | | | Merge branch 'api-guard' into 'master'Rémy Coutable2018-02-051-1/+5
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Remove unnused escape_html methodosw-markdown-bypass-for-commit-messagesOswaldo Ferreira2018-02-021-4/+0
| * | | | | | | Bypass commits title markdown on notesOswaldo Ferreira2018-02-023-23/+37
* | | | | | | | Merge branch 'gitaly-user-squash' into 'master'Rémy Coutable2018-02-055-28/+114
|\ \ \ \ \ \ \ \
| * | | | | | | | Incorporate OperationService.UserSquash Gitaly RPCgitaly-user-squashAlejandro Rodríguez2018-02-025-28/+114
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'zj-fix-flay' into 'master'Rémy Coutable2018-02-054-5/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Ignore Flay failuresZeger-Jan van de Weg2018-01-311-0/+2
View Lorry Controller Status